From 45839c3ed14b2a28c34fe6ee3900d83e71b8ff59 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 4 Jun 2019 11:39:12 +0200
Subject: [PATCH] update to 5.2.0 allow bartlett/php-compatinfo-db v2

(cherry picked from commit 5d9ff078445c87c7edc8561c7e74c7a57977bb3f)
---
 .gitignore                       |  1 +
 php-bartlett-PHP-CompatInfo.spec | 23 ++++++++++++++---------
 sources                          |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29c8457..e75c1d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ clog
 /php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz
 /php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz
 /php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz
+/php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 6822d98..219e8c5 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-2017 Remi Collet
+# Copyright (c) 2011-2019 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    e1239c5433be4a121ade2ab5aec9bb81faae7134
+%global gh_commit    b54d10946b0f10d67be0faffb5dee24d687effd3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151005
 %global gh_owner     llaville
@@ -19,19 +19,18 @@
 #global prever       RC2
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 %global sym_prefix php-symfony3
 %else
 %global sym_prefix php-symfony
 %endif
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        5.1.0
+Version:        5.2.0
 %global specrel 1
 Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
-Group:          Development/Libraries
 License:        BSD
 URL:            http://php5.laurent-laville.org/compatinfo/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz
@@ -53,7 +52,7 @@ BuildRequires:  php-pdo_sqlite
 %global phpunit %{_bindir}/phpunit7
 BuildRequires:  (php-composer(bartlett/php-reflect)       >= 4.3  with php-composer(bartlett/php-reflect)       < 5)
 BuildRequires:  (php-composer(nikic/php-parser)           >= 3.1  with php-composer(nikic/php-parser)           < 4)
-BuildRequires:  (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2)
+BuildRequires:  (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 3)
 BuildRequires:  (php-composer(psr/log)                    >= 1.0  with php-composer(psr/log)                    < 2)
 Requires:       (php-composer(doctrine/cache)             >= 1.3  with php-composer(doctrine/cache)             < 2)
 BuildRequires:  %{phpunit}
@@ -67,21 +66,23 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "ext-pcre": "*",
 #        "ext-spl": "*",
 #        "ext-json": "*",
+#        "ext-pdo": "*",
 #        "ext-pdo_sqlite": "*",
 #        "bartlett/php-reflect": "^4.3",
 #        "nikic/php-parser": "^3.1",
-#        "bartlett/php-compatinfo-db": "^1.23",
+#        "bartlett/php-compatinfo-db": "^1.23|^2.0",
 #        "psr/log": "^1.0"
 Requires:       php(language) >= 5.5
 Requires:       php-cli
 Requires:       php-json
 Requires:       php-libxml
 Requires:       php-pcre
+Requires:       php-pdo
 Requires:       php-pdo_sqlite
 Requires:       php-spl
 Requires:       (php-composer(bartlett/php-reflect)       >= 4.3  with php-composer(bartlett/php-reflect)       < 5)
 Requires:       (php-composer(nikic/php-parser)           >= 3.1  with php-composer(nikic/php-parser)           < 4)
-Requires:       (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2)
+Requires:       (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 3)
 Requires:       (php-composer(psr/log)                    >= 1.0  with php-composer(psr/log)                    < 2)
 # Mandatory for our patch
 Requires:       (php-composer(doctrine/cache)             >= 1.3  with php-composer(doctrine/cache)             < 2)
@@ -150,7 +151,7 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/
 
 
 ret=0
-for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73; do
+for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit7} \
@@ -180,6 +181,10 @@ fi
 
 
 %changelog
+* Mon Jun  3 2019 Remi Collet <remi@remirepo.net> - 5.2.0-1
+- update to 5.2.0
+- allow bartlett/php-compatinfo-db v2
+
 * Wed Nov 28 2018 Remi Collet <remi@remirepo.net> - 5.1.0-1
 - update to 5.1.0
 - raise dependency on bartlett/php-reflect 4.3
diff --git a/sources b/sources
index 8f09d87..8f79902 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz) = 54a4f106b230ed84e8a219e3471232ac94bf141c789c338e3d6fb297dad24c9a60be66a97cdeefec96d4ab091a2d788a9ecbb0a73ab56e6e52a1c3a827a846c5
+SHA512 (php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz) = 8c584d23159664c2cb998e96d52b4b272d83c732d5a693125e809b971d5a1d1579f5cd74c0d6b70911b7db10b37e3dd4c641c72b662b9a9dac0fc8c4782657d6