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

switch to bz2 archive to workaround RHEL-125143
---
 failed.txt |  2 +-
 php.spec   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/failed.txt b/failed.txt
index 134d8d7..4a09dce 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/php.spec b/php.spec
index 38c5ba2..7230842 100644
--- a/php.spec
+++ b/php.spec
@@ -101,14 +101,14 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.5.0
-%global rcver        RC5
-%global lowrc        rc5
+#global rcver        RC5
+#global lowrc        rc5
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lowrc:~%{lowrc}}%{?gh_date:.%{gh_date}}
-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
@@ -122,10 +122,10 @@ URL: http://www.php.net/
 %if 0%{?gh_date}
 Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upver}-%{gh_short}.tar.gz
 %else
-Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
+Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.bz2
 # 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
 %endif
 Source1: php.conf
 Source2: php.ini
@@ -1372,7 +1372,7 @@ ln -s %{_bindir}/lsphp     $RPM_BUILD_ROOT%{_root_bindir}/ls%{scl}
 
 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
@@ -1657,6 +1657,10 @@ fi
 
 
 %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