From 708b0ffbef9d75128873e1679f1c16fa77f040e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Feb 2018 13:57:44 +0100 Subject: use range dependency on F27+ --- php-phpunit-PHP-CodeCoverage.spec | 62 +++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/php-phpunit-PHP-CodeCoverage.spec b/php-phpunit-PHP-CodeCoverage.spec index 1d0d5cf..15e2793 100644 --- a/php-phpunit-PHP-CodeCoverage.spec +++ b/php-phpunit-PHP-CodeCoverage.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-PHP-CodeCoverage # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -18,7 +18,7 @@ %global pear_channel pear.phpunit.de %global major 4.0 %global minor 8 -%global specrel 3 +%global specrel 4 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -44,16 +44,28 @@ BuildRequires: php-fedora-autoloader-devel # From composer.json, "require-dev": { # "phpunit/phpunit": "^5.7", # "ext-xdebug": "^2.1.4" -BuildRequires: php-composer(phpunit/phpunit) >= 5.7 -BuildRequires: php-composer(sebastian/code-unit-reverse-lookup) >= 1 -BuildRequires: php-composer(sebastian/environment) >= 1.3.2 -BuildRequires: php-pecl-xdebug >= 2.4.0 +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(phpunit/phpunit) >= 5.7 with php-composer(phpunit/phpunit) < 6) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 1.3 with php-composer(phpunit/php-file-iterator) < 2) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 1.4.2 with php-composer(phpunit/php-token-stream) < 3) +BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2 with php-composer(phpunit/php-text-template) < 2) +BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) +BuildRequires: (php-composer(sebastian/environment) >= 1.3.2 with php-composer(sebastian/environment) < 3) +BuildRequires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3) +%else +BuildRequires: php-phpunit-PHPUnit >= 5.7 +BuildRequires: php-phpunit-File-Iterator >= 1.3 %if 0%{?fedora} >= 25 -BuildRequires: php-composer(phpunit/php-token-stream) < 3 +BuildRequires: php-phpunit-php-token-stream2 %else -BuildRequires: php-composer(phpunit/php-token-stream) < 2 +BuildRequires: php-phpunit-PHP-TokenStream >= 1.4.2 %endif -BuildRequires: php-composer(phpunit/php-token-stream) >= 1.4.2 +BuildRequires: php-phpunit-Text-Template +BuildRequires: php-sebastian-code-unit-reverse-lookup +BuildRequires: php-phpunit-environment >= 1.3.2 +BuildRequires: php-phpunit-Version +%endif +BuildRequires: php-pecl-xdebug >= 2.4.0 %endif # From composer.json, require @@ -69,22 +81,25 @@ BuildRequires: php-composer(phpunit/php-token-stream) >= 1.4.2 Requires: php(language) >= 5.6 Requires: php-dom Requires: php-xmlwriter -Requires: php-composer(phpunit/php-file-iterator) >= 1.3 -Requires: php-composer(phpunit/php-file-iterator) < 2 -Requires: php-composer(phpunit/php-token-stream) >= 1.4.2 +%if 0%{?fedora} >= 27 +Requires: (php-composer(phpunit/php-file-iterator) >= 1.3 with php-composer(phpunit/php-file-iterator) < 2) +Requires: (php-composer(phpunit/php-token-stream) >= 1.4.2 with php-composer(phpunit/php-token-stream) < 3) +Requires: (php-composer(phpunit/php-text-template) >= 1.2 with php-composer(phpunit/php-text-template) < 2) +Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) +Requires: (php-composer(sebastian/environment) >= 1.3.2 with php-composer(sebastian/environment) < 3) +Requires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3) +%else +Requires: php-phpunit-File-Iterator >= 1.3 %if 0%{?fedora} >= 25 -Requires: php-composer(phpunit/php-token-stream) < 3 +Requires: php-phpunit-php-token-stream2 %else -Requires: php-composer(phpunit/php-token-stream) < 2 +Requires: php-phpunit-PHP-TokenStream >= 1.4.2 +%endif +Requires: php-phpunit-Text-Template +Requires: php-sebastian-code-unit-reverse-lookup +Requires: php-phpunit-environment >= 1.3.2 +Requires: php-phpunit-Version %endif -Requires: php-composer(phpunit/php-text-template) >= 1.2 -Requires: php-composer(phpunit/php-text-template) < 2 -Requires: php-composer(sebastian/code-unit-reverse-lookup) >= 1 -Requires: php-composer(sebastian/code-unit-reverse-lookup) < 2 -Requires: php-composer(sebastian/environment) >= 1.3.2 -Requires: php-composer(sebastian/environment) < 3 -Requires: php-composer(sebastian/version) >= 1.0 -Requires: php-composer(sebastian/version) < 3 # From composer.json, suggest # "ext-xdebug": "^2.5.1", # From phpcompatinfo report for version 4.0.4 @@ -184,6 +199,9 @@ fi %changelog +* Fri Feb 2 2018 Remi Collet - 4.0.8-4 +- use range dependency on F27+ + * Mon Nov 6 2017 Remi Collet - 4.0.8-3 - adapt autoloader for php-sebastian-php-token-stream2 -- cgit