From 07d77230143a23644279acbd6ce9712c5f7178d3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 31 Jul 2024 11:10:28 +0200
Subject: use oracle client library version 23.5 on x86_64

---
 php.spec | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/php.spec b/php.spec
index 57dbe2f..8b251cc 100644
--- a/php.spec
+++ b/php.spec
@@ -56,13 +56,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.5
+%global oraclemax 24
+%global oraclelib 23.1
+%global oracledir 23
 %endif
 
 # Build for LiteSpeed Web Server (LSAPI)
@@ -133,7 +135,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 22%{?dist}
+Release: 23%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -653,7 +655,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
@@ -873,8 +875,12 @@ Group: System Environment/Libraries
 # All files licensed under PHP version 3.01
 License: PHP
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
+%if 0%{?rhel}
 # Upstream requires 4.0, we require 69.1 to ensure use of libicu69
 BuildRequires: libicu-devel = 69.1
+%else
+BuildRequires: libicu-devel
+%endif
 
 %description intl
 The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -1975,6 +1981,9 @@ EOF
 
 
 %changelog
+* Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 7.2.34-23
+- use oracle client library version 23.5 on x86_64
+
 * Tue Jun  4 2024 Remi Collet <remi@remirepo.net> - 7.2.34-22
 - Fix filter bypass in filter_var FILTER_VALIDATE_URL
   CVE-2024-5458
-- 
cgit