summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-10-06 07:34:03 +0200
committerRemi Collet <remi@php.net>2021-10-06 07:34:03 +0200
commitd6cd319e16c6fe20124fa156503d14f1663147af (patch)
tree4d5df84d229251790bb8b05a657a38785c4ef843
parent9a9f79ca36a223248468de02d7909219f8de76a5 (diff)
update to 7.4.24RC1HEADmaster
use libicu version 69
-rw-r--r--failed.txt9
-rw-r--r--php74.spec18
2 files changed, 16 insertions, 11 deletions
diff --git a/failed.txt b/failed.txt
index 2dfad1b..079f5cd 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,14 +1,15 @@
-===== 7.4.24 (2021-09-23)
+===== 7.4.25RC1 (2021-10-07)
$ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log
/var/lib/mock/el7x/build.log:Tests failed : 0
/var/lib/mock/el8x74/build.log:Tests failed : 0
-/var/lib/mock/fc32x/build.log:Tests failed : 0
-/var/lib/mock/fc33x/build.log:Tests failed : 0
-/var/lib/mock/fc34x/build.log:Tests failed : 0
+/var/lib/mock/fc33x/build.log:Tests failed : 1
+/var/lib/mock/fc34x/build.log:Tests failed : 1
+fc33x, fc34x
+ 4 Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt]
1 proc_open give erratic test results :(
diff --git a/php74.spec b/php74.spec
index 01a7c1c..7ab8e11 100644
--- a/php74.spec
+++ b/php74.spec
@@ -90,8 +90,8 @@
%global with_libzip 1
%global with_zip 0
-%global upver 7.4.24
-#global rcver RC1
+%global upver 7.4.25
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -997,9 +997,9 @@ Group: System Environment/Libraries
# All files licensed under PHP version 3.01
License: PHP
Requires: 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
%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
@@ -1794,7 +1794,7 @@ 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
do
- $TESTCMD --modules | grep -qi $mod
+ $TESTCMD --modules | grep -i "$mod\$"
done
TESTCMD="$TESTCMD --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/php/modules"
@@ -1839,7 +1839,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
@@ -2162,6 +2162,10 @@ fi
%changelog
+* Wed Oct 6 2021 Remi Collet <remi@remirepo.net> - 7.4.25~RC1-1
+- update to 7.4.24RC1
+- use libicu version 69
+
* Tue Sep 21 2021 Remi Collet <remi@remirepo.net> - 7.4.24-1
- Update to 7.4.24 - http://www.php.net/releases/7_4_24.php