From 4a8e477f26f91da30fe2ba371f634a4a0fd56e6f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 18 Feb 2019 11:28:49 +0100
Subject: [PATCH] v4.2.1

---
 .gitignore                      |  1 +
 php-nikic-php-parser4-rpm.patch | 13 +------------
 php-nikic-php-parser4.spec      | 16 ++++++++++++----
 sources                         |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c39b07..068c3ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /php-nikic-php-parser4-4.1.0-d0230c5.tar.gz
 /php-nikic-php-parser4-4.1.1-8aae5b5.tar.gz
 /php-nikic-php-parser4-4.2.0-594bcae.tar.gz
+/php-nikic-php-parser4-4.2.1-5221f49.tar.gz
diff --git a/php-nikic-php-parser4-rpm.patch b/php-nikic-php-parser4-rpm.patch
index bbdfc8f..66edc42 100644
--- a/php-nikic-php-parser4-rpm.patch
+++ b/php-nikic-php-parser4-rpm.patch
@@ -15,15 +15,4 @@ diff -up ./bin/php-parse.rpm ./bin/php-parse
  
  ini_set('xdebug.max_nesting_level', 3000);
  
-diff -up ./test/bootstrap.php.rpm ./test/bootstrap.php
---- ./test/bootstrap.php.rpm	2016-04-20 06:33:22.713063604 +0200
-+++ ./test/bootstrap.php	2016-04-20 06:34:38.963385593 +0200
-@@ -2,7 +2,7 @@
- 
- namespace PhpParser;
- 
--require __DIR__ . '/../vendor/autoload.php';
-+require '@BUILDROOT@/usr/share/php/PhpParser4/autoload.php';
- 
- function canonicalize($str) {
-     // normalize EOL style
+
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 8162ddf..8139b83 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    594bcae1fc0bccd3993d2f0d61a018e26ac2865a
+%global gh_commit    5221f49a608808c1e4d436df32884cbc1b821ac0
 %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.2.0
-Release:        2%{?dist}
+Version:        4.2.1
+Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
 License:        BSD
@@ -113,7 +113,12 @@ sed -e 's:%{php_home}:%{buildroot}%{php_home}:' \
 php bin/php-parse-test --help
 
 : Test suite autoloader
-sed -e 's:@BUILDROOT@:%{buildroot}:' -i test/bootstrap.php
+mkdir vendor
+cat << 'AUTOLOAD' | tee vendor/autoload.php
+<?php
+require_once '%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', dirname(__DIR__).'/test/PhpParser/');
+AUTOLOAD
 
 : Upstream test suite
 ret=0
@@ -138,6 +143,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb 18 2019 Remi Collet <remi@remirepo.net> - 4.2.1-1
+- update to 4.2.1
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 0892e90..63af6a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.2.0-594bcae.tar.gz) = 093a5dc47d71e248f33c93363cd0a5e45fdd28c11c234f8bb54045beb666a2bb916b6c7cef27937258948158d517ee84971f26821957cfcfbc94a183266405b7
+SHA512 (php-nikic-php-parser4-4.2.1-5221f49.tar.gz) = ab2a1b7f656fb524437ac911a2a5da7a04f24d7b30ae429d4ed6a0713ec1347bfde7d6a1fb2e1f7a350dddd3adb449d62ec160cc457ed481e65d99ca304eaf55