From 0544197e3aba5e144c4d09c9532c54539960b330 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 20 Nov 2024 07:12:00 +0100
Subject: Update to 8.4.0 GA - http://www.php.net/releases/8_4_0.php

---
 failed.txt |  4 +++-
 php84.spec | 24 +++++++++---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/failed.txt b/failed.txt
index 4f6cd17..eedffb9 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.4.0RC4 (2024-11-05)
+===== 8.4.0 (2024-11-21)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
@@ -6,6 +6,8 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 /var/lib/mock/el8x84/build.log:Tests failed   :    0
 /var/lib/mock/el9a84/build.log:Tests failed   :    0
 /var/lib/mock/el9x84/build.log:Tests failed   :    0
+/var/lib/mock/el10a84/build.log:Tests failed  :    0
+/var/lib/mock/el10x84/build.log:Tests failed  :    0
 /var/lib/mock/fc39a84/build.log:Tests failed  :    0
 /var/lib/mock/fc39x84/build.log:Tests failed  :    0
 /var/lib/mock/fc40a84/build.log:Tests failed  :    0
diff --git a/php84.spec b/php84.spec
index 2db02b2..45d3b29 100644
--- a/php84.spec
+++ b/php84.spec
@@ -23,18 +23,6 @@
 
 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
-%ifarch aarch64
-%global oraclever 19.24
-%global oraclemax 20
-%global oraclelib 19.1
-%global oracledir 19.24
-%else
-%global oraclever 23.5
-%global oraclemax 24
-%global oraclelib 23.1
-%global oracledir 23
-%endif
-
 # Build for LiteSpeed Web Server (LSAPI), you can disable using --without tests
 %bcond_without        lsws
 
@@ -52,7 +40,11 @@
 %bcond_without        libxcrypt
 
 # Build firebird extensions, you can disable using --without firebird
+%if 0%{?rhel} == 10
+%bcond_with           firebird
+%else
 %bcond_without        firebird
+%endif
 
 # Build ZTS extension or only NTS using --without zts
 %bcond_with           zts
@@ -82,13 +74,12 @@
 %bcond_with            zip
 
 %global upver          8.4.0
-%global rcver          RC4
-%global rclow          rc4
+#global rcver          RC4
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: %{upver}%{?rcver:~%{rclow}}
+Version: %{upver}%{?rcver:~%{rcver}}
 Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -1702,6 +1693,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Wed Nov 20 2024 Remi Collet <remi@remirepo.net> - 8.4.0-1
+- Update to 8.4.0 GA - http://www.php.net/releases/8_4_0.php
+
 * Tue Nov  5 2024 Remi Collet <remi@remirepo.net> - 8.4.0~rc4-1
 - Update to 8.4.0RC4
 
-- 
cgit