From 3766f476a7a80dea5d8b414e7a594820cc81fb20 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 3 Jan 2022 08:08:08 +0100
Subject: update to 6.0.2

open https://github.com/llaville/php-compatinfo/issues/316
  regression, compatibility with Symfony 4
---
 php-bartlett-PHP-CompatInfo.spec | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'php-bartlett-PHP-CompatInfo.spec')

diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 42bf8d3..1651c31 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo
 #
-# Copyright (c) 2011-2021 Remi Collet
+# Copyright (c) 2011-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -11,7 +11,7 @@
 %undefine __brp_mangle_shebangs
 
 %{!?php_version:  %global php_version  %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
-%global gh_commit    5978aea8eb937157c72b8217dcaac148e6f5ae7d
+%global gh_commit    4beab5e0a5c27fb81a3ba0b262b3ed85a19500be
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151005
 %global gh_owner     llaville
@@ -19,7 +19,7 @@
 #global prever       RC2
 %bcond_without       tests
 
-%global upstream_version  6.0.1
+%global upstream_version  6.0.2
 #global upstream_prever   RC1
 
 Name:           php-bartlett-PHP-CompatInfo
@@ -36,7 +36,9 @@ Source1:        fedora-review-check
 
 # Autoload and config path
 # avoid jean85/pretty-package-versions
-Patch0:         %{name}-6.0.0-rpm.patch
+Patch0:         %{name}-6.0.2-rpm.patch
+# upstream patch for Symfony 4
+Patch1:         %{name}-6.0.2-sf4.patch
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.4
@@ -154,6 +156,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
+%patch1 -p1 -b .sf4
 
 phpab \
   --template fedora \
@@ -194,7 +197,8 @@ cat << 'EOF' | tee -a src/autoload.php
 EOF
 
 # Cleanup patched files
-find src -name \*rpm -delete -print
+find src -name \*.rpm -delete -print
+find src -name \*.sf4 -delete -print
 
 # fix path in configuration
 sed -e 's:/src::' -i config/set/*php
@@ -263,6 +267,11 @@ fi
 
 
 %changelog
+* Mon Jan  3 2022 Remi Collet <remi@remirepo.net> - 6.0.2-1
+- update to 6.0.2
+- open https://github.com/llaville/php-compatinfo/issues/316
+  regression, compatibility with Symfony 4
+
 * Mon Dec 13 2021 Remi Collet <remi@remirepo.net> - 6.0.1-1
 - update to 6.0.1
 - raise dependency on PHP 7.4
-- 
cgit