update to 8.5.0RC3HEADmaster

3 files changed, 26 insertions, 26 deletions

diff --git a/failed.txt b/failed.txt
index 8d07d12..3513963 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/el8a85/build.log:Tests failed   :    1
-/var/lib/mock/el8x85/build.log:Tests failed   :    1
-/var/lib/mock/el9a85/build.log:Tests failed   :    1
-/var/lib/mock/el9x85/build.log:Tests failed   :    1
-/var/lib/mock/el10a85/build.log:Tests failed  :    1
-/var/lib/mock/el10x85/build.log:Tests failed  :    1
-/var/lib/mock/fc41a85/build.log:Tests failed  :    1
-/var/lib/mock/fc41x85/build.log:Tests failed  :    1
-/var/lib/mock/fc42a85/build.log:Tests failed  :    1
-/var/lib/mock/fc42x85/build.log:Tests failed  :    1
-/var/lib/mock/fc43a85/build.log:Tests failed  :    1
-/var/lib/mock/fc43x85/build.log:Tests failed  :    1
+/var/lib/mock/el8a85/build.log:Tests failed   :    0
+/var/lib/mock/el8x85/build.log:Tests failed   :    0
+/var/lib/mock/el9a85/build.log:Tests failed   :    0
+/var/lib/mock/el9x85/build.log:Tests failed   :    0
+/var/lib/mock/el10a85/build.log:Tests failed  :    0
+/var/lib/mock/el10x85/build.log:Tests failed  :    0
+/var/lib/mock/fc41a85/build.log:Tests failed  :    0
+/var/lib/mock/fc41x85/build.log:Tests failed  :    0
+/var/lib/mock/fc42a85/build.log:Tests failed  :    0
+/var/lib/mock/fc42x85/build.log:Tests failed  :    0
+/var/lib/mock/fc43a85/build.log:Tests failed  :    0
+/var/lib/mock/fc43x85/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..2aaeee9 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}
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
diff --git a/php85.spec b/php85.spec
index a836cb2..ffbd7d0 100644
--- a/php85.spec
+++ b/php85.spec
@@ -64,8 +64,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
@@ -88,7 +88,7 @@
 %bcond_with            zip
 
 %global upver          8.5.0
-%global rcver          RC2
+%global rcver          RC3
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -127,7 +127,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
 
@@ -207,9 +207,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
 #BuildRequires: bison
 #BuildRequires: re2c >= 1.0.3
@@ -1440,6 +1440,7 @@ build --includedir=%{_includedir}/php-zts \
 %if %{with zip}
       --with-zip=shared \
 %endif
+      --enable-pcntl \
       --without-readline \
       --with-libedit \
       --enable-phar=shared \
@@ -1744,13 +1745,11 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/php.ini
 %config(noreplace) %{_sysconfdir}/php.d/10-opcache.ini
 %config(noreplace) %{_sysconfdir}/php.d/opcache-default.blacklist
-%if %{with zts}
-%config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist
-%endif
 %dir %{_sysconfdir}/php.d
 %dir %{_libdir}/php
 %dir %{_libdir}/php/modules
 %if %{with zts}
+%config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist
 %dir %{_sysconfdir}/php-zts.d
 %dir %{_libdir}/php-zts
 %dir %{_libdir}/php-zts/modules
@@ -1869,7 +1868,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %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