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

---
 php80.spec | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'php80.spec')

diff --git a/php80.spec b/php80.spec
index 581c977..ed374f7 100644
--- a/php80.spec
+++ b/php80.spec
@@ -25,13 +25,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), you can disable using --without tests
@@ -118,7 +120,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 6%{?dist}
+Release: 7%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -245,6 +247,9 @@ BuildRequires: libtool
 BuildRequires: libtool-ltdl-devel
 %if %{with dtrace}
 BuildRequires: %{?dtsprefix}systemtap-sdt-devel
+%if 0%{?fedora} >= 41
+BuildRequires: %{?dtsprefix}systemtap-sdt-dtrace
+%endif
 %endif
 #BuildRequires: bison
 #BuildRequires: re2c
@@ -764,7 +769,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
@@ -2225,6 +2230,9 @@ EOF
 
 
 %changelog
+* Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 8.0.30-7
+- use oracle client library version 23.5 on x86_64
+
 * Tue Jun  4 2024 Remi Collet <remi@remirepo.net> - 8.0.30-6
 - Fix filter bypass in filter_var FILTER_VALIDATE_URL
   CVE-2024-5458
-- 
cgit