From 4285d14873e98839b36fd476c62dd00279d5a7dd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Oct 2024 16:52:03 +0200
Subject: Update to 8.4.0RC2

---
 failed.txt              |  2 +-
 php-8.4.0-phpinfo.patch | 18 +++++++++---------
 php.spec                |  7 +++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/failed.txt b/failed.txt
index 5591712..61dc7ab 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.4.0RC1 (2024-09-26)
+===== 8.4.0RC2 (2024-10-10)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php-8.4.0-phpinfo.patch b/php-8.4.0-phpinfo.patch
index 2536f9e..47bdbde 100644
--- a/php-8.4.0-phpinfo.patch
+++ b/php-8.4.0-phpinfo.patch
@@ -7,9 +7,9 @@ Replace full GCC name by gcc in php -v output
 
 
 diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
---- ./ext/standard/info.c.phpinfo	2020-07-21 10:49:31.000000000 +0200
-+++ ./ext/standard/info.c	2020-07-21 11:41:56.295633523 +0200
-@@ -805,9 +805,6 @@ PHPAPI ZEND_COLD void php_print_info(int
+--- ./ext/standard/info.c.phpinfo	2024-10-08 15:57:40.000000000 +0200
++++ ./ext/standard/info.c	2024-10-08 16:10:11.330510009 +0200
+@@ -814,9 +814,6 @@ PHPAPI ZEND_COLD void php_print_info(int
  #ifdef PHP_BUILD_ARCH
  		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
  #endif
@@ -20,20 +20,20 @@ diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
  		if (sapi_module.pretty_name) {
  			php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
 diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
---- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2020-07-21 10:49:31.000000000 +0200
-+++ ./ext/standard/tests/general_functions/phpinfo.phpt	2020-07-21 11:41:56.296633522 +0200
+--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2024-10-08 16:12:47.009579597 +0200
++++ ./ext/standard/tests/general_functions/phpinfo.phpt	2024-10-08 16:12:52.273784836 +0200
 @@ -17,7 +17,6 @@ PHP Version => %s
  
  System => %s
- Build Date => %s%a
+ Build Date => %r(.+?)%r
 -Configure Command => %s
  Server API => Command Line Interface
  Virtual Directory Support => %s
  Configuration File (php.ini) Path => %s
 diff -up ./main/main.c.phpinfo ./main/main.c
---- ./main/main.c.phpinfo	2024-08-13 16:14:03.242363191 +0200
-+++ ./main/main.c	2024-08-13 16:14:06.588499946 +0200
-@@ -119,7 +119,7 @@ PHPAPI char *php_get_version(sapi_module
+--- ./main/main.c.phpinfo	2024-10-08 15:57:40.000000000 +0200
++++ ./main/main.c	2024-10-08 16:10:11.331510049 +0200
+@@ -118,7 +118,7 @@ PHPAPI char *php_get_version(sapi_module
  		"NTS"
  #endif
  #ifdef PHP_BUILD_COMPILER
diff --git a/php.spec b/php.spec
index c27bd37..1277191 100644
--- a/php.spec
+++ b/php.spec
@@ -84,8 +84,8 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.4.0
-%global rcver        RC1
-%global rclow        rc1
+%global rcver        RC2
+%global rclow        rc2
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -1653,6 +1653,9 @@ fi
 
 
 %changelog
+* Tue Oct  8 2024 Remi Collet <remi@remirepo.net> - 8.4.0~rc2-1
+- Update to 8.4.0RC2
+
 * Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 8.4.0~rc1-1
 - Update to 8.4.0RC1
 - bump ABI/API numbers
-- 
cgit