summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-04-12 17:36:06 +0200
committerRemi Collet <remi@php.net>2022-04-12 17:36:06 +0200
commit56a1f8520dec47c4116ead6758ac49a7d21fbeeb (patch)
tree7ff4d4dd298002aef23515f2c5f0012d5786250b
parentf53897256087e4948b95aced844484db3c39a442 (diff)
Update to 7.4.29 - http://www.php.net/releases/7_4_29.phpHEADmaster
-rw-r--r--failed.txt2
-rw-r--r--php.spec11
2 files changed, 7 insertions, 6 deletions
diff --git a/failed.txt b/failed.txt
index 030ff14..3bc92de 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.4.28 (2022-02-17)
+===== 7.4.29 (2022-04-14)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php.spec b/php.spec
index 2c07d20..1b5cbe6 100644
--- a/php.spec
+++ b/php.spec
@@ -104,13 +104,13 @@
#global gh_date 20190612
%global gh_owner php
%global gh_project php-src
-%global upver 7.4.28
+%global upver 7.4.29
#global rcver RC1
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: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -722,7 +722,7 @@ License: PHP and BSD
%endif
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
%if %{with_libgd}
-BuildRequires: pkgconfig(gdlib) >= 2.3
+BuildRequires: pkgconfig(gdlib) >= 2.3.3
%else
# Required to build the bundled GD library
BuildRequires: pkgconfig(zlib)
@@ -977,8 +977,6 @@ mkdir \
# ----- Manage known as failed test -------
# affected by systzdata patch
rm ext/date/tests/timezone_location_get.phpt
-rm ext/date/tests/timezone_version_get.phpt
-rm ext/date/tests/timezone_version_get_basic1.phpt
%if 0%{?fedora} < 28
# need tzdata 2018i
rm ext/date/tests/bug33414-1.phpt
@@ -1830,6 +1828,9 @@ fi
%changelog
+* Tue Apr 12 2022 Remi Collet <remi@remirepo.net> - 7.4.29-1
+- Update to 7.4.29 - http://www.php.net/releases/7_4_29.php
+
* Tue Feb 22 2022 Remi Collet <remi@remirepo.net> - 7.4.28-2
- retrieve tzdata version
- use oracle client library version 21.5