From 11a8107f181c37ec0ed79f019cb7471aca784001 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 10 Nov 2021 08:11:11 +0100
Subject: update to 8.1.0RC6

---
 failed.txt             |  3 ++-
 php-8.1.0-parser.patch |  4 ++--
 php81.spec             | 13 ++++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/failed.txt b/failed.txt
index 77e9e46..3bff648 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,9 +1,10 @@
-===== 8.1.0RC5 (2021-10-28)
+===== 8.1.0RC6 (2021-11-11)
 
 $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log
 
 /var/lib/mock/el7x/build.log:Tests failed    :     1
 /var/lib/mock/el8x81/build.log:Tests failed  :     1
+/var/lib/mock/el9x81/build.log:Tests failed  :     0
 /var/lib/mock/fc33x/build.log:Tests failed    :    0
 /var/lib/mock/fc34x/build.log:Tests failed    :    0
 /var/lib/mock/fc35x/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)) {
diff --git a/php81.spec b/php81.spec
index f54825d..b6baacf 100644
--- a/php81.spec
+++ b/php81.spec
@@ -65,7 +65,11 @@
 %endif
 
 # Build firebird extensions, you can disable using --without firebird
+%if 0%{?rhel} == 9
+%bcond_with           firebird
+%else
 %bcond_without        firebird
+%endif
 
 # Build ZTS extension or only NTS using --without zts
 %bcond_without        zts
@@ -109,8 +113,8 @@
 %bcond_with            zip
 
 %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: php
@@ -483,7 +487,7 @@ Obsoletes: php74-devel, php74w-devel
 Obsoletes: php80-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: php-nikic-php-parser4 >= 4.3.0
+Recommends: php-nikic-php-parser4 >= 4.13.0
 %endif
 
 %description devel
@@ -2179,6 +2183,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)
-- 
cgit