From 0c1ecf5e6d0230c0d8e83bd2e735f4c804f76398 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 21 Jul 2021 18:46:55 +0200
Subject: update to 4.12.0

---
 php-nikic-php-parser4.spec | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'php-nikic-php-parser4.spec')

diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 631d415..25ea5cd 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    fe14cf3672a149364fb66dfe11bf6549af899f94
+%global gh_commit    6608f01670c3cc5079e18c1dab1104e002579143
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nikic
 %global gh_project   PHP-Parser
@@ -21,8 +21,8 @@
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
-Version:        4.11.0
-Release:        2%{?dist}
+Version:        4.12.0
+Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
 License:        BSD
@@ -32,8 +32,6 @@ Source1:        makesrc.sh
 
 # Autoloader
 Patch0:         %{name}-rpm.patch
-# For PHP 8.1
-Patch1:         %{name}-upstream.patch
 
 BuildArch:      noarch
 %if %{with_tests}
@@ -88,7 +86,6 @@ Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
-%patch1 -p1
 
 
 %build
@@ -131,8 +128,7 @@ else
 fi
 
 ret=0
-# TODO php81
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d include_path=%{php_home} \
@@ -157,6 +153,9 @@ exit $ret
 
 
 %changelog
+* Wed Jul 21 2021 Remi Collet <remi@remirepo.net> - 4.12.0-1
+- update to 4.12.0
+
 * Wed Jul 21 2021 Remi Collet <remi@remirepo.net> - 4.11.0-2
 - add upstream patches for PHP 8.1
 
-- 
cgit