From 5c3e25449c4417c329bf4f6339281b6efefd3c81 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 3 Mar 2022 08:07:45 +0100
Subject: update to 8.1.4RC1
---
failed.txt | 8 +++-----
php-GH8059.patch | 23 -----------------------
php.spec | 16 ++++++++--------
3 files changed, 11 insertions(+), 36 deletions(-)
delete mode 100644 php-GH8059.patch
diff --git a/failed.txt b/failed.txt
index 7eaaf21..d7dda0f 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,17 +1,15 @@
-===== 8.1.3 (2022-02-17)
+===== 8.1.4RC1 (2022-03-03)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
-/var/lib/mock/scl81el7x/build.log:Tests failed : 1
-/var/lib/mock/scl81el8x/build.log:Tests failed : 1
+/var/lib/mock/scl81el7x/build.log:Tests failed : 0
+/var/lib/mock/scl81el8x/build.log:Tests failed : 0
/var/lib/mock/scl81el9x/build.log:Tests failed : 0
/var/lib/mock/scl81fc34x/build.log:Tests failed : 0
/var/lib/mock/scl81fc35x/build.log:Tests failed : 0
/var/lib/mock/scl81fc36x/build.log:Tests failed : 0
-el7x, el8x
- 4 Bug #80963: DateTimeZone::getTransitions() truncated [ext/date/tests/bug80963.phpt]
(1) proc_open give erratic test results :(
diff --git a/php-GH8059.patch b/php-GH8059.patch
deleted file mode 100644
index 817d044..0000000
--- a/php-GH8059.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3b463749f544a7b538264ee2a9647e4bca92f9b0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 8 Feb 2022 09:36:37 +0100
-Subject: [PATCH] Fix GH-8059 use $PHP_EXECUTABLE when $PHP not set
-
----
- build/Makefile.global | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build/Makefile.global b/build/Makefile.global
-index 6941bab6ad41..f93a874ce1b5 100644
---- a/build/Makefile.global
-+++ b/build/Makefile.global
-@@ -148,6 +148,9 @@ prof-use:
- if test ! -z "$(PHP)"; then \
- echo Parse $< to generate $@;\
- $(PHP) $(top_srcdir)/build/gen_stub.php $<; \
-+ elif test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
-+ echo Parse $< to generate $@;\
-+ $(PHP_EXECUTABLE) $(top_srcdir)/build/gen_stub.php $<; \
- fi; \
- fi;
-
diff --git a/php.spec b/php.spec
index 6394292..586ffeb 100644
--- a/php.spec
+++ b/php.spec
@@ -122,14 +122,14 @@
#global gh_date 20210809
%global gh_owner php
%global gh_project php-src
-%global upver 8.1.3
-#global rcver RC1
-#global lower RC1
+%global upver 8.1.4
+%global rcver RC1
+%global lower RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?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
@@ -192,7 +192,6 @@ Patch47: php-8.1.0-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-GH8059.patch
# Security fixes (200+)
@@ -966,7 +965,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .gh8059
# security patches
@@ -996,8 +994,7 @@ mkdir \
# 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
+rm ext/date/tests/bug80963.phpt
%endif
# too fast builder
rm ext/date/tests/bug73837.phpt
@@ -1843,6 +1840,9 @@ fi
%changelog
+* Thu Mar 3 2022 Remi Collet <remi@remirepo.net> - 8.1.4~RC1-1
+- update to 8.1.4RC1
+
* Tue Feb 22 2022 Remi Collet <remi@remirepo.net> - 8.1.3-2
- retrieve tzdata version
- use oracle client library version 21.5
--
cgit