summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt28
-rw-r--r--php-8.5.0-includedir.patch (renamed from php-8.4.0-includedir.patch)2
-rw-r--r--php.spec19
3 files changed, 25 insertions, 24 deletions
diff --git a/failed.txt b/failed.txt
index 00083bb..75e8678 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,23 +1,21 @@
-===== 8.5.0RC2 (2025-10-09)
+===== 8.5.0RC3 (2025-10-23)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
-/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
+/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/scl83fc43a/build.log:Tests failed : 0
+/var/lib/mock/scl83fc43x/build.log:Tests failed : 0
-all
- 2 CGI with auto_globals_jit=0 [sapi/cgi/tests/auto_globals_no_jit.phpt]
(1) proc_open give erratic test results :(
diff --git a/php-8.4.0-includedir.patch b/php-8.5.0-includedir.patch
index 8d3fcff..ada0cbc 100644
--- a/php-8.4.0-includedir.patch
+++ b/php-8.5.0-includedir.patch
@@ -5,7 +5,7 @@
EXPANDED_PHP_CONFIG_FILE_PATH=$(eval echo "$PHP_CONFIG_FILE_PATH")
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=$(eval echo "$PHP_CONFIG_FILE_SCAN_DIR")
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
-+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php:/usr/share/pear:/usr/share/php
++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}:/usr/share/pear:/usr/share/php
exec_prefix=$old_exec_prefix
libdir=$old_libdir
diff --git a/php.spec b/php.spec
index 02104b4..ff7b612 100644
--- a/php.spec
+++ b/php.spec
@@ -87,8 +87,8 @@
%else
%bcond_with openssl32
%endif
-%if 0%{?fedora} >= 44
-# liburiparser version 0.9.9 required
+%if 0
+# liburiparser version 0.9.10 required
%bcond_without liburiparser
%else
# use bundled library instead
@@ -101,8 +101,8 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.5.0
-%global rcver RC2
-%global lowrc rc2
+%global rcver RC3
+%global lowrc rc3
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -143,7 +143,7 @@ Source53: 20-ffi.ini
# Build fixes
Patch1: php-8.4.0-httpd.patch
-Patch5: php-8.4.0-includedir.patch
+Patch5: php-8.5.0-includedir.patch
Patch6: php-8.5.0-embed.patch
Patch8: php-8.4.0-libdb.patch
@@ -222,9 +222,9 @@ BuildRequires: %{?dtsprefix}systemtap-sdt-dtrace
%endif
%endif
%if %{with liburiparser}
-BuildRequires: pkgconfig(liburiparser) >= 0.9.9
+BuildRequires: pkgconfig(liburiparser) >= 0.9.10
%else
-Provides: bundled(liburiparser) = 0.9.9
+Provides: bundled(liburiparser) = 0.9.10
%endif
%if 0%{?gh_date}
BuildRequires: bison
@@ -1657,7 +1657,10 @@ fi
%changelog
-* Tue Oct 7 2025 Remi Collet <remi@remirepo.net> - 8.5.0~r21-1
+* Wed Oct 22 2025 Remi Collet <remi@remirepo.net> - 8.5.0~rc3-1
+- update to 8.5.0RC3
+
+* Tue Oct 7 2025 Remi Collet <remi@remirepo.net> - 8.5.0~rc2-1
- update to 8.5.0RC2
* Wed Sep 24 2025 Remi Collet <remi@remirepo.net> - 8.5.0~rc1-1