- update to 5.2.0

- allow bartlett/php-compatinfo-db v2

2 files changed, 18 insertions, 11 deletions

diff --git a/composer.json b/composer.json
index 5277e8f..a8cdab5 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,11 @@
         "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"
     },
     "require-dev": {
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 0dc48f5..8e9ff60 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,14 +19,14 @@
 #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
@@ -55,7 +55,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)
 # remirepo:12
@@ -64,7 +64,7 @@ Requires:       (php-composer(doctrine/cache)             >= 1.3  with php-compo
 BuildRequires:  php-composer(bartlett/php-reflect)        <  5
 BuildRequires:  php-composer(bartlett/php-reflect)        >= 4.2
 BuildRequires:  php-nikic-php-parser3                     >= 3.1
-BuildRequires:  php-composer(bartlett/php-compatinfo-db)  <  2
+BuildRequires:  php-composer(bartlett/php-compatinfo-db)  <  3
 BuildRequires:  php-composer(bartlett/php-compatinfo-db)  >= 1.23
 BuildRequires:  php-composer(psr/log)                     <  2
 BuildRequires:  php-composer(psr/log)                     >= 1.0
@@ -82,23 +82,25 @@ 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
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 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)
@@ -107,7 +109,7 @@ Requires:       (php-composer(doctrine/cache)             >= 1.3  with php-compo
 Requires:       php-composer(bartlett/php-reflect)       <  5
 Requires:       php-composer(bartlett/php-reflect)       >= 4.2
 Requires:       php-nikic-php-parser3                    >= 3.1
-Requires:       php-composer(bartlett/php-compatinfo-db) <  2
+Requires:       php-composer(bartlett/php-compatinfo-db) <  3
 Requires:       php-composer(bartlett/php-compatinfo-db) >= 1.23
 Requires:       php-composer(psr/log)                    <  2
 Requires:       php-composer(psr/log)                    >= 1.0
@@ -184,7 +186,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} \
@@ -214,6 +216,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