From 043a7edc3184e0d7889fa58138850052af3472ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Feb 2018 15:52:35 +0100 Subject: use range dependencies on F27+ undefine __brp_mangle_shebangs --- php-phpunit-phploc.spec | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec index de10457..00141e2 100644 --- a/php-phpunit-phploc.spec +++ b/php-phpunit-phploc.spec @@ -1,12 +1,16 @@ # remirepo/fedora spec file for php-phpunit-phploc # -# Copyright (c) 2009-2016 Guillaume Kulakowski, Christof Damian, Remi Collet +# Copyright (c) 2009-2018 Guillaume Kulakowski, Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT # # Please, preserve the changelog entries # + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + %global gh_commit 6a8a9416517b82d6326ac9c2d040ad53c13654eb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -18,7 +22,7 @@ Name: php-phpunit-phploc Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for quickly measuring the size of a PHP project Group: Development/Libraries @@ -33,18 +37,17 @@ BuildArch: noarch BuildRequires: php(language) >= 5.6 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: php-composer(sebastian/finder-facade) < 2 -BuildRequires: php-composer(sebastian/finder-facade) >= 1.1 -BuildRequires: php-composer(sebastian/version) < 3 -BuildRequires: php-composer(sebastian/version) >= 2.0 -%if 0%{?fedora} >= 26 -BuildRequires: php-composer(symfony/console) < 5 +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2) +BuildRequires: (php-composer(sebastian/version) >= 2.0 with php-composer(sebastian/version) < 3) +BuildRequires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5) %global phpunit %{_bindir}/phpunit6 %else -BuildRequires: php-composer(symfony/console) < 4 +BuildRequires: php-phpunit-FinderFacade >= 1.1 +BuildRequires: php-phpunit-Version >= 2.0 +BuildRequires: php-symfony3-console %global phpunit %{_bindir}/phpunit %endif -BuildRequires: php-composer(symfony/console) >= 2.7 BuildRequires: %{phpunit} %endif @@ -55,16 +58,15 @@ BuildRequires: %{phpunit} # "symfony/console": "^2.7|^3.0|^4.0" Requires: php(language) >= 5.6 Requires: php-cli -Requires: php-composer(sebastian/finder-facade) < 2 -Requires: php-composer(sebastian/finder-facade) >= 1.1 -Requires: php-composer(sebastian/version) < 3 -Requires: php-composer(sebastian/version) >= 2.0 -%if 0%{?fedora} >= 26 -Requires: php-composer(symfony/console) < 5 +%if 0%{?fedora} >= 27 +Requires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2) +Requires: (php-composer(sebastian/version) >= 2.0 with php-composer(sebastian/version) < 3) +Requires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5) %else -Requires: php-composer(symfony/console) < 4 +Requires: php-phpunit-FinderFacade >= 1.1 +Requires: php-phpunit-Version >= 2.0 +Requires: php-symfony3-console %endif -Requires: php-composer(symfony/console) >= 2.7 # From phpcompatinfo report for version 4.0.0 Requires: php-dom Requires: php-spl @@ -123,7 +125,7 @@ install -D -p -m 755 phploc %{buildroot}%{_bindir}/phploc %if %{with_tests} %check ret=0 -for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmd in "php %{phpunit}" php70 php71 php72; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit6} \ @@ -152,6 +154,10 @@ fi %changelog +* Tue Feb 6 2018 Remi Collet - 4.0.1-2 +- use range dependencies on F27+ +- undefine __brp_mangle_shebangs + * Sun Nov 19 2017 Remi Collet - 4.0.1-1 - Update to 4.0.1 - allow Symfony 4 -- cgit