From 395cb64249332084def64a04ad0316088dd89e6f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Nov 2025 08:14:29 +0100
Subject: Update to 8.5.0 GA

switch to bz2 archive to workaround RHEL-125143
---
 failed.txt |  2 +-
 php85.spec | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/failed.txt b/failed.txt
index c46cc02..0ee0dd3 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.5.0RC5 (2025-11-13)
+===== 8.5.0 (2025-11-20)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php85.spec b/php85.spec
index 6c0a217..c19d4ef 100644
--- a/php85.spec
+++ b/php85.spec
@@ -88,13 +88,13 @@
 %bcond_with            zip
 
 %global upver          8.5.0
-%global rcver          RC5
+#global rcver          RC5
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -105,7 +105,7 @@ Release: 2%{?dist}
 License: PHP-3.01 AND Zend-2.0 AND BSD-2-Clause AND MIT AND Apache-1.0 AND NCSA AND BSL-1.0
 URL: http://www.php.net/
 
-Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
+Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.bz2
 Source1: php.conf
 Source2: php.ini
 Source3: macros.php
@@ -119,7 +119,7 @@ Source13: nginx-fpm.conf
 Source14: nginx-php.conf
 # See https://secure.php.net/gpg-keys.php
 Source20: https://www.php.net/distributions/php-keyring.gpg
-Source21: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz.asc
+Source21: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.bz2.asc
 # Configuration files for some extensions
 Source50: 10-opcache.ini
 Source51: opcache-default.blacklist
@@ -1576,7 +1576,7 @@ install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.
 
 TESTCMD="$RPM_BUILD_ROOT%{_bindir}/php --no-php-ini"
 # Ensure all provided extensions are really there
-for mod in core date filter hash json libxml openssl pcntl pcre readline reflection session spl standard zlib
+for mod in core date filter hash json lexbor libxml openssl pcntl pcre random readline reflection session spl standard uri zlib
 do
      $TESTCMD --modules | grep -i "$mod\$"
 done
@@ -1869,6 +1869,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Wed Nov 19 2025 Remi Collet <remi@remirepo.net> - 8.5.0-1
+- Update to 8.5.0 GA
+- switch to bz2 archive to workaround RHEL-125143
+
 * Mon Nov 17 2025 Remi Collet <remi@remirepo.net> - 8.5.0~RC5-2
 - move httpd/nginx drop-ins back to /usr/lib/systemd/system #2415127
 
-- 
cgit