From aed289950cc86da735e6ec2a6cd73fa883774707 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 1 Oct 2021 07:58:30 +0200
Subject: rebuild using ICU 69

---
 php.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index fff1d90..b7c6b70 100644
--- a/php.spec
+++ b/php.spec
@@ -113,7 +113,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 3%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -797,9 +797,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) >= 65
-BuildRequires: pkgconfig(icu-io)   >= 65
-BuildRequires: pkgconfig(icu-uc)   >= 65
+BuildRequires: pkgconfig(icu-i18n) >= 69
+BuildRequires: pkgconfig(icu-io)   >= 69
+BuildRequires: pkgconfig(icu-uc)   >= 69
 
 %description intl
 The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -1481,9 +1481,9 @@ ln -s %{_bindir}/lsphp     $RPM_BUILD_ROOT%{_root_bindir}/ls%{scl}
 
 TESTCMD="$RPM_BUILD_ROOT%{_bindir}/php --no-php-ini"
 # Ensure all provided extensions are really there
-for mod in core date filter hash libxml openssl pcntl pcre readline reflection session spl standard zlib
+for mod in core date filter hash json libxml openssl pcntl pcre readline reflection session spl standard zlib
 do
-     $TESTCMD --modules | grep -qi $mod
+     $TESTCMD --modules | grep -i "$mod\$"
 done
 
 TESTCMD="$TESTCMD --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/php/modules"
@@ -1543,7 +1543,7 @@ do
         ini=20-${mod}.ini;;
     esac
 
-    $TESTCMD --modules | grep -qi $mod
+    $TESTCMD --modules | grep -i "$mod\$"
 
     # some extensions have their own config file
     if [ -f ${ini} ]; then
@@ -1817,6 +1817,9 @@ fi
 
 
 %changelog
+* Fri Oct  1 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc3-3
+- rebuild using ICU 69
+
 * Wed Sep 29 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc3-1
 - update to 8.1.0RC3
 
-- 
cgit