From fdf30f83cca6fba8458873fe171dc278c8d30cf3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Jan 2019 11:48:45 +0100 Subject: v7.2.15RC1 --- failed.txt | 5 ++++- php.spec | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/failed.txt b/failed.txt index 83acd3c..9e98651 100644 --- a/failed.txt +++ b/failed.txt @@ -1,9 +1,10 @@ -===== 7.2.14 (2019-01-10) +===== 7.2.15RC1 (2019-01-31) $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log /var/lib/mock/scl72el6x/build.log:Tests failed : 0 /var/lib/mock/scl72el7x/build.log:Tests failed : 0 +/var/lib/mock/scl72el8x/build.log:Tests failed : 18 /var/lib/mock/scl72fc25x/build.log:Tests failed : 0 /var/lib/mock/scl72fc26x/build.log:Tests failed : 0 /var/lib/mock/scl72fc27x/build.log:Tests failed : 0 @@ -11,6 +12,8 @@ $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log /var/lib/mock/scl72fc29x/build.log:Tests failed : 0 +el8x: + buildroot issue under investigation (1) proc_open give erratic test results :( diff --git a/php.spec b/php.spec index d5c95fb..cb87fcb 100644 --- a/php.spec +++ b/php.spec @@ -129,13 +129,13 @@ %global db_devel libdb-devel %endif -%global upver 7.2.14 -#global rcver RC1 +%global upver 7.2.15 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}} -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 @@ -919,7 +919,7 @@ low-level PHP extension for the libsodium cryptographic library. %endif %patch40 -p1 -b .dlopen -%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 %patch42 -p1 -b .systzdata %endif %patch43 -p1 -b .headers @@ -984,6 +984,12 @@ rm Zend/tests/bug54268.phpt rm Zend/tests/bug68412.phpt # slow and erratic result rm sapi/cli/tests/upload_2G.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 # Safety check for API version change. pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) @@ -1155,7 +1161,7 @@ ln -sf ../configure --with-layout=GNU \ --with-kerberos \ --with-libxml-dir=%{_root_prefix} \ -%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 --with-system-tzdata \ %endif --with-mhash \ @@ -1875,6 +1881,9 @@ fi %changelog +* Wed Jan 30 2019 Remi Collet 7.2.15~RC1-1 +- update to 7.2.15RC1 + * Thu Jan 17 2019 Remi Collet 7.2.14-2 - cleanup for EL-8 -- cgit