diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | php.spec | 24 |
2 files changed, 17 insertions, 9 deletions
@@ -3,4 +3,4 @@ NAME := $(shell basename $(SRCDIR)) include ../../common/Makefile srpm: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) --define 'scl php80' -bs $(NAME).spec + rpmbuild $(RPMDEFINES) $(SRCDEFINES) --define 'scl php81' -bs $(NAME).spec @@ -86,6 +86,14 @@ # build with system libgd (gd-last in remi repo) %bcond_without libgd +# build with system tzdata (2021 required) +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8 +%bcond_without tzdata +%else +%bcond_with tzdata +%endif + + # httpd 2.4.10 with httpd-filesystem and sethandler support %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 %global with_httpd2410 1 @@ -93,7 +101,7 @@ %global with_httpd2410 0 %endif -%global gh_commit b76a9dbcf979574dbff6b92ccb80e8f252ce46db +%global gh_commit 27ce269c1b5a12cb28e4047b5b6b6fc83adf6e15 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_date 20210608 %global gh_owner php @@ -216,6 +224,9 @@ BuildRequires: re2c %endif # used for tests BuildRequires: /bin/ps +%if %{with tzdata} +BuildRequires: tzdata >= 2021 +%endif Requires: httpd-mmn = %{_httpd_mmn} Provides: %{?scl_prefix}mod_php = %{version}-%{release} @@ -920,7 +931,7 @@ in pure PHP. %endif %patch41 -p1 -b .syslib -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6 +%if %{with tzdata} %patch42 -p1 -b .systzdata %endif %patch43 -p1 -b .headers @@ -960,14 +971,10 @@ mkdir \ # ----- Manage known as failed test ------- # affected by systzdata patch +%if %{with tzdata} 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 -rm ext/date/tests/bug33415-2.phpt -rm ext/date/tests/date_modify-1.phpt %endif # too fast builder rm ext/date/tests/bug73837.phpt @@ -1145,7 +1152,7 @@ ln -sf ../configure --with-layout=GNU \ --with-kerberos \ --with-libxml \ -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 +%if %{with tzdata} --with-system-tzdata \ %endif --with-mhash \ @@ -1810,6 +1817,7 @@ fi * Tue Jun 8 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210608-1 - new build - ignore unsupported "threads" options in password_hash +- temporarily use bundled tzdata on EL-7 * Fri Jun 4 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210604-1 - update to 8.1.0-dev |