From 06206de011934284bb081505ecdfce3ca39aab7c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 7 Dec 2023 07:36:25 +0100
Subject: update to 8.3.1RC3

---
 failed.txt         |  2 +-
 php-upstream.patch | 43 -------------------------------------------
 php.spec           |  8 ++++----
 3 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 php-upstream.patch

diff --git a/failed.txt b/failed.txt
index fe43cdd..0d020af 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.3.1RC1 (2023-12-07)
+===== 8.3.1RC3 (2023-12-07)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php-upstream.patch b/php-upstream.patch
deleted file mode 100644
index 24227a8..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Revert unwanted API changes from
-
-
-From 78f5ea1eba7c1247d375d5dd40f34d9076d5e1fd Mon Sep 17 00:00:00 2001
-From: Eric Mann <ericmann@php.net>
-Date: Tue, 5 Dec 2023 07:48:07 -0800
-Subject: [PATCH] Update versions for PHP 8.3.1RC1
-
----
- NEWS                   | 2 +-
- Zend/zend.h            | 2 +-
- Zend/zend_extensions.h | 2 +-
- Zend/zend_modules.h    | 2 +-
- configure.ac           | 2 +-
- main/php_version.h     | 4 ++--
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
-index 461358abd2bc9..5b9be6b765f72 100644
---- a/Zend/zend_extensions.h
-+++ b/Zend/zend_extensions.h
-@@ -44,7 +44,7 @@ You can use the following macro to check the extension API version for compatibi
- 
- /* The first number is the engine version and the rest is the date (YYYYMMDD).
-  * This way engine 2/3 API no. is always greater than engine 1 API no..  */
--#define ZEND_EXTENSION_API_NO	420230831
-+#define ZEND_EXTENSION_API_NO	420231207
- 
- typedef struct _zend_extension_version_info {
- 	int zend_extension_api_no;
-diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
-index 09661e6a2b862..8ec86db4ad915 100644
---- a/Zend/zend_modules.h
-+++ b/Zend/zend_modules.h
-@@ -31,7 +31,7 @@
- #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module
- #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module
- 
--#define ZEND_MODULE_API_NO 20230831
-+#define ZEND_MODULE_API_NO 20231207
- #ifdef ZTS
- #define USING_ZTS 1
- #else
diff --git a/php.spec b/php.spec
index 2508356..f5c0b0d 100644
--- a/php.spec
+++ b/php.spec
@@ -130,7 +130,7 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.3.1
-%global rcver        RC1
+%global rcver        RC3
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -203,8 +203,6 @@ Patch48: php-8.3.0-openssl-ec-param.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
-# revert unwanted API change
-Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -991,7 +989,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P91 -p1 -b .remi-oci8
 
 # upstream patches
-%patch -P100 -p1 -R -b .revert
 
 # security patches
 
@@ -1877,6 +1874,9 @@ fi
 
 
 %changelog
+* Thu Dec  7 2023 Remi Collet <remi@remirepo.net> - 8.3.1~RC3-1
+- update to 8.3.1RC3
+
 * Wed Dec  6 2023 Remi Collet <remi@remirepo.net> - 8.3.1~RC1-1
 - update to 8.3.1RC1
 
-- 
cgit