From 16d8fb666217a4f9b4e3f7a0938085fa22b418ee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Feb 2018 07:23:45 +0100 Subject: Update to 5.0.12 (no change) use range dependency on F27+ --- php-bartlett-PHP-CompatInfo.spec | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 868ce77..0e7fa54 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,8 +6,12 @@ # # Please, preserve the changelog entries # + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 56a9f8bcfa63651d5752659447d6145cfa296a3e +%global gh_commit ecf11cf73912e56cc91814b540e4789cdc8739c6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -22,7 +26,7 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.0.11 +Version: 5.0.12 %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 @@ -47,8 +51,15 @@ BuildRequires: php(language) >= 5.5 # to run test suite BuildRequires: %{_bindir}/phpunit BuildRequires: php-pdo_sqlite +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(bartlett/php-reflect) >= 4.2 with php-composer(bartlett/php-reflect) < 5) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +%else +BuildRequires: php-composer(bartlett/php-reflect) < 5 BuildRequires: php-composer(bartlett/php-reflect) >= 4.2 -BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.15 +BuildRequires: php-composer(bartlett/php-compatinfo-db) < 2 +BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.23 +%endif # For our patch / autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -60,7 +71,6 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-spl": "*", # "ext-json": "*", # "ext-pdo_sqlite": "*", -# "symfony/console": "~2.5", # "bartlett/php-reflect": "^4.2", # "bartlett/php-compatinfo-db": "^1.23" Requires: php(language) >= 5.5 @@ -70,11 +80,15 @@ Requires: php-libxml Requires: php-pcre Requires: php-pdo_sqlite Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 4.2 +%if 0%{?fedora} >= 27 +Requires: (php-composer(bartlett/php-reflect) >= 4.2 with php-composer(bartlett/php-reflect) < 5) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +%else Requires: php-composer(bartlett/php-reflect) < 5 -Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 +Requires: php-composer(bartlett/php-reflect) >= 4.2 Requires: php-composer(bartlett/php-compatinfo-db) < 2 -Requires: %{sym_prefix}-console +Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 +%endif # From composer.json, "require-dev": { # "doctrine/cache": "^1.3", # "psr/log": "^1.0", @@ -146,7 +160,7 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi @@ -174,6 +188,10 @@ fi %changelog +* Fri Feb 2 2018 Remi Collet - 5.0.12-1 +- Update to 5.0.12 (no change) +- use range dependency on F27+ + * Tue Dec 12 2017 Remi Collet - 5.0.11-1 - Update to 5.0.11 (no change) - raise dependency on PHP 5.5 -- cgit