From e8d62e2c5fae30ccc4dcb55cc1fd7b967fad9946 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 17 Jul 2024 07:59:56 +0200
Subject: update to 8.2.22RC1

use oracle client library version 23.4 on x86_64, 19.23 on aarch64
---
 failed.txt |  2 +-
 php.spec   | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/failed.txt b/failed.txt
index 6c53e62..6b153fd 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.2.21 (2024-07-04)
+===== 8.2.22RC1 (2024-07-18)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php.spec b/php.spec
index 1f138fb..c30e919 100644
--- a/php.spec
+++ b/php.spec
@@ -50,13 +50,15 @@
 %global mysql_sock %(mysql_config --socket  2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
 %ifarch aarch64
-%global oraclever 19.22
+%global oraclever 19.23
+%global oraclemax 20
 %global oraclelib 19.1
-%global oracledir 19.22
+%global oracledir 19.23
 %else
-%global oraclever 21.13
-%global oraclelib 21.1
-%global oracledir 21
+%global oraclever 23.4
+%global oraclemax 24
+%global oraclelib 23.1
+%global oracledir 23
 %endif
 
 # Build for LiteSpeed Web Server (LSAPI), you can disable using --without tests
@@ -129,8 +131,8 @@
 #global gh_date      20220530
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        8.2.21
-#global rcver        RC1
+%global upver        8.2.22
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -644,7 +646,7 @@ BuildRequires:  oracle-instantclient%{oraclever}-devel
 Requires:       libclntsh.so.%{oraclelib}
 AutoReq:        0
 %else
-BuildRequires:  oracle-instantclient-devel >= %{oraclever}
+BuildRequires: (oracle-instantclient-devel >= %{oraclever} with oracle-instantclient-devel < %{oraclemax})
 %endif
 Requires:       %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides:       %{?scl_prefix}php_database
@@ -1862,6 +1864,10 @@ fi
 
 
 %changelog
+* Wed Jul 17 2024 Remi Collet <remi@remirepo.net> - 8.2.22~RC1-1
+- update to 8.2.22RC1
+- use oracle client library version 23.4 on x86_64, 19.23 on aarch64
+
 * Tue Jul  2 2024 Remi Collet <remi@remirepo.net> - 8.2.21-1
 - Update to 8.2.21 - http://www.php.net/releases/8_2_21.php
 
-- 
cgit