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

---
 php73.spec | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'php73.spec')

diff --git a/php73.spec b/php73.spec
index 8430735..dc63534 100644
--- a/php73.spec
+++ b/php73.spec
@@ -26,13 +26,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)
@@ -122,7 +124,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 14%{?dist}
+Release: 15%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -756,7 +758,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:       php-pdo%{?_isa} = %{version}-%{release}
 Provides:       php_database
@@ -1057,12 +1059,14 @@ Group: System Environment/Libraries
 # All files licensed under PHP version 3.01
 License: PHP
 Requires: 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
-%if 0%{?rhel}
 Obsoletes: php53-intl, php53u-intl, php54-intl, php54w-intl, php55u-intl, php55w-intl, php56u-intl, php56w-intl
 Obsoletes: php70u-intl, php70w-intl, php71u-intl, php71w-intl, php72u-intl, php72w-intl
 Obsoletes: php73-intl, php73w-intl
+%else
+BuildRequires: libicu-devel
 %endif
 
 %description intl
@@ -2305,6 +2309,9 @@ EOF
 
 
 %changelog
+* Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 7.3.33-15
+- use oracle client library version 23.5 on x86_64
+
 * Tue Jun  4 2024 Remi Collet <remi@remirepo.net> - 7.3.33-14
 - Fix filter bypass in filter_var FILTER_VALIDATE_URL
   CVE-2024-5458
-- 
cgit