summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt26
-rw-r--r--php.spec22
2 files changed, 35 insertions, 13 deletions
diff --git a/failed.txt b/failed.txt
index 2773d55..1f29643 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,19 +1,23 @@
-===== 8.5.0beta2 (2025-08-28)
+===== 8.5.0beta3 (2025-09-11)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
-/var/lib/mock/scl83el8a/build.log:Tests failed : 0
-/var/lib/mock/scl83el8x/build.log:Tests failed : 0
-/var/lib/mock/scl83el9a/build.log:Tests failed : 0
-/var/lib/mock/scl83el9x/build.log:Tests failed : 0
-/var/lib/mock/scl83el10a/build.log:Tests failed : 0
-/var/lib/mock/scl83el10x/build.log:Tests failed : 0
-/var/lib/mock/scl83fc41a/build.log:Tests failed : 0
-/var/lib/mock/scl83fc41x/build.log:Tests failed : 0
-/var/lib/mock/scl83fc42a/build.log:Tests failed : 0
-/var/lib/mock/scl83fc42x/build.log:Tests failed : 0
+/var/lib/mock/scl83el8a/build.log:Tests failed : 1
+/var/lib/mock/scl83el8x/build.log:Tests failed : 1
+/var/lib/mock/scl83el9a/build.log:Tests failed : 1
+/var/lib/mock/scl83el9x/build.log:Tests failed : 1
+/var/lib/mock/scl83el10a/build.log:Tests failed : 1
+/var/lib/mock/scl83el10x/build.log:Tests failed : 1
+/var/lib/mock/scl83fc41a/build.log:Tests failed : 1
+/var/lib/mock/scl83fc41x/build.log:Tests failed : 1
+/var/lib/mock/scl83fc42a/build.log:Tests failed : 1
+/var/lib/mock/scl83fc42x/build.log:Tests failed : 1
+/var/lib/mock/scl83fc43a/build.log:Tests failed : 1
+/var/lib/mock/scl83fc43x/build.log:Tests failed : 1
+all
+ 2 sapi/cli/tests/php_cli_server_ipv4_error_message.phpt
(1) proc_open give erratic test results :(
diff --git a/php.spec b/php.spec
index 2cc3d09..e4bc819 100644
--- a/php.spec
+++ b/php.spec
@@ -87,6 +87,13 @@
%else
%bcond_with openssl32
%endif
+%if 0%{?fedora} >= 44
+# liburiparser version 0.9.9 required
+%bcond_without liburiparser
+%else
+# use bundled library instead
+%bcond_with liburiparser
+%endif
%global gh_commit c9249e2d3aa401bda5d9a3071e86e0594807ed00
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
@@ -94,8 +101,8 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.5.0
-%global rcver beta2
-%global lowrc beta2
+%global rcver beta3
+%global lowrc beta3
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -214,6 +221,11 @@ BuildRequires: %{?dtsprefix}systemtap-sdt-devel
BuildRequires: %{?dtsprefix}systemtap-sdt-dtrace
%endif
%endif
+%if %{with liburiparser}
+BuildRequires: pkgconfig(liburiparser) >= 0.9.9
+%else
+Provides: bundled(liburiparser) = 0.9.9
+%endif
%if 0%{?gh_date}
BuildRequires: bison
BuildRequires: re2c >= 1.0.3
@@ -1062,6 +1074,9 @@ ln -sf ../configure
%if %{with libxcrypt}
--with-external-libcrypt \
%endif
+%if %{with liburiparser}
+ --with-external-uriparser \
+%endif
--with-zlib \
--with-layout=GNU \
--with-libxml \
@@ -1642,6 +1657,9 @@ fi
%changelog
+* Tue Sep 9 2025 Remi Collet <remi@remirepo.net> - 8.5.0~beta3-1
+- update to 8.5.0beta3
+
* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 8.5.0~beta2-1
- update to 8.5.0beta2