diff options
| -rw-r--r-- | failed.txt | 3 | ||||
| -rw-r--r-- | php-8.1.0-parser.patch | 4 | ||||
| -rw-r--r-- | php.spec | 13 |
3 files changed, 14 insertions, 6 deletions
@@ -1,9 +1,10 @@ -===== 8.1.0RC5 (2021-10-28) +===== 8.1.0RC6 (2021-11-11) $ 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/scl81el9x/build.log:Tests failed : 0 /var/lib/mock/scl81fc33x/build.log:Tests failed : 0 /var/lib/mock/scl81fc34x/build.log:Tests failed : 0 /var/lib/mock/scl81fc35x/build.log:Tests failed : 0 diff --git a/php-8.1.0-parser.patch b/php-8.1.0-parser.patch index f443f1d..2326136 100644 --- a/php-8.1.0-parser.patch +++ b/php-8.1.0-parser.patch @@ -1,7 +1,7 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php --- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200 +++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200 -@@ -1075,6 +1075,12 @@ function initPhpParser() { +@@ -3265,6 +3265,12 @@ function initPhpParser() { } $isInitialized = true; @@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php + return; + } + - $version = "4.12.0"; + $version = "4.13.0"; $phpParserDir = __DIR__ . "/PHP-Parser-$version"; if (!is_dir($phpParserDir)) { @@ -68,7 +68,11 @@ %bcond_with zip # Optional extensions; to disable: pass "--without xxx" etc to rpmbuild/mock. %bcond_without imap +%if 0%{?rhel} == 9 +%bcond_with firebird +%else %bcond_without firebird +%endif %bcond_without freetds %bcond_without tidy %bcond_without sqlite3 @@ -124,8 +128,8 @@ %global gh_owner php %global gh_project php-src %global upver 8.1.0 -%global rcver RC5 -%global lower rc5 +%global rcver RC6 +%global lower rc6 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -431,7 +435,7 @@ Requires: pcre2-devel%{?_isa} >= 10.30 %endif Requires: zlib-devel%{?_isa} %if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: php-nikic-php-parser4 >= 4.12.0 +Recommends: php-nikic-php-parser4 >= 4.13.0 %endif %description devel @@ -1847,6 +1851,9 @@ fi %changelog +* Wed Nov 10 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc6-1 +- update to 8.1.0RC6 + * Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc5-1 - update to 8.1.0RC5 - build using system libxcrypt (Fedora only) |