From 44a3553d84f16206fcfe80093741cf93f01b7efb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Nov 2021 08:47:53 +0100 Subject: update to 7.4.26RC1 --- failed.txt | 10 ++++------ php.spec | 12 ++++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/failed.txt b/failed.txt index d6329a5..658c8ac 100644 --- a/failed.txt +++ b/failed.txt @@ -1,16 +1,14 @@ -===== 7.4.25 (2021-10-21) +===== 7.4.26RC1 (2021-11-04) $ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log /var/lib/mock/scl74el7x/build.log:Tests failed : 0 /var/lib/mock/scl74el8x/build.log:Tests failed : 0 -/var/lib/mock/scl74fc33x/build.log:Tests failed : 1 -/var/lib/mock/scl74fc34x/build.log:Tests failed : 1 -/var/lib/mock/scl74fc35x/build.log:Tests failed : 1 +/var/lib/mock/scl74fc33x/build.log:Tests failed : 0 +/var/lib/mock/scl74fc34x/build.log:Tests failed : 0 +/var/lib/mock/scl74fc35x/build.log:Tests failed : 0 -fc33x, fc34x; fc35x - 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/php.spec b/php.spec index 6af92a8..ea78c7f 100644 --- a/php.spec +++ b/php.spec @@ -78,7 +78,8 @@ %global with_libpcre 0 %endif -%if 0%{?fedora} >= 33 +# Using qdbm from "remi" for now, see https://bugzilla.redhat.com/2017308 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8 %bcond_without qdbm %else %bcond_with qdbm @@ -103,13 +104,13 @@ #global gh_date 20190612 %global gh_owner php %global gh_project php-src -%global upver 7.4.25 -#global rcver RC1 +%global upver 7.4.26 +%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 @@ -1828,6 +1829,9 @@ fi %changelog +* Wed Nov 3 2021 Remi Collet - 7.4.26~RC1-1 +- update to 7.4.26RC1 + * Tue Oct 26 2021 Remi Collet - 7.4.25-2 - dba: enable qdbm backend -- cgit