From a5cc5694f2314745fdc953b179712c36db8c95ff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Feb 2025 10:30:10 +0100 Subject: backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ backport fix for ICU 74+ --- php81.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'php81.spec') diff --git a/php81.spec b/php81.spec index e8b912b..4d01475 100644 --- a/php81.spec +++ b/php81.spec @@ -25,12 +25,12 @@ %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) %ifarch aarch64 -%global oraclever 19.24 +%global oraclever 19.25 %global oraclemax 20 %global oraclelib 19.1 -%global oracledir 19.24 +%global oracledir 19.25 %else -%global oraclever 23.6 +%global oraclever 23.7 %global oraclemax 24 %global oraclelib 23.1 %global oracledir 23 @@ -131,7 +131,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -170,8 +170,8 @@ Patch1: php-7.4.0-httpd.patch Patch5: php-7.2.0-includedir.patch Patch6: php-8.0.0-embed.patch Patch8: php-8.1.0-libdb.patch -# RHEL backports -Patch10: php-7.0.7-curl.patch +# For recent ICU from 8.2 +Patch11: php-8.1.31-icu.patch # Functional changes # Use system nikic/php-parser @@ -1196,9 +1196,7 @@ in pure PHP. %patch -P5 -p1 -b .includedir %patch -P6 -p1 -b .embed %patch -P8 -p1 -b .libdb -%if 0%{?rhel} == 7 -%patch -P10 -p1 -b .curltls -%endif +%patch -P11 -p1 -b .icu74 %patch -P41 -p1 -b .syslib %if %{with tzdata} @@ -2209,6 +2207,9 @@ fi %changelog +* Thu Feb 13 2025 Remi Collet - 8.1.31-2 +- backport fix for ICU 74+ + * Wed Nov 20 2024 Remi Collet - 8.1.31-1 - Update to 8.1.31 - http://www.php.net/releases/8_1_31.php -- cgit