From 35f7aae912e76042e995d974e55983bcad6dd119 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 12 Dec 2023 15:15:53 +0100
Subject: use ICU 73.2

use oracle client library version 21.12 on x86_64, 19.19 on aarch64
add fixes for libxml 2.11 and 2.12 from 8.1
---
 php.spec | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index c0d72cd..75c87b7 100644
--- a/php.spec
+++ b/php.spec
@@ -54,7 +54,7 @@
 %global oraclelib 19.1
 %global oracledir 19.19
 %else
-%global oraclever 21.11
+%global oraclever 21.12
 %global oraclelib 21.1
 %global oracledir 21
 %endif
@@ -126,7 +126,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 2%{?dist}
+Release: 3%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -165,7 +165,9 @@ Source53: 20-ffi.ini
 Patch1: php-7.4.0-httpd.patch
 Patch5: php-7.2.0-includedir.patch
 Patch6: php-8.0.0-embed.patch
-Patch8: php-7.4.0-libdb.patch
+Patch7: php-7.4.0-libdb.patch
+# For libxml 2.12 from 8.1
+Patch8: php-8.0.30-libxml212.patch
 # get rid of deprecated functions from 8.1
 Patch9: php-8.0.6-deprecated.patch
 # RHEL backports
@@ -828,9 +830,9 @@ Summary: Internationalization extension for PHP applications
 # All files licensed under PHP version 3.01
 License: PHP
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-BuildRequires: pkgconfig(icu-i18n) >= 72
-BuildRequires: pkgconfig(icu-io)   >= 72
-BuildRequires: pkgconfig(icu-uc)   >= 72
+BuildRequires: pkgconfig(icu-i18n) >= 73
+BuildRequires: pkgconfig(icu-io)   >= 73
+BuildRequires: pkgconfig(icu-uc)   >= 73
 
 %description intl
 The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -958,7 +960,8 @@ in pure PHP.
 %patch -P1 -p1 -b .mpmcheck
 %patch -P5 -p1 -b .includedir
 %patch -P6 -p1 -b .embed
-%patch -P8 -p1 -b .libdb
+%patch -P7 -p1 -b .libdb
+%patch -P8 -p1 -b .libxml212
 %patch -P9 -p1 -b .deprecated
 %if 0%{?rhel} == 7
 %patch -P10 -p1 -b .curltls
@@ -1863,6 +1866,11 @@ fi
 
 
 %changelog
+* Tue Dec 12 2023 Remi Collet <remi@remirepo.net> - 8.0.30-3
+- use ICU 73.2
+- use oracle client library version 21.12 on x86_64, 19.19 on aarch64
+- add fixes for libxml 2.11 and 2.12 from 8.1
+
 * Thu Sep 21 2023 Remi Collet <remi@remirepo.net> - 8.0.30-2
 - use oracle client library version 21.11 on x86_64, 19.19 on aarch64
 - use official Oracle Instant Client RPM
-- 
cgit