From ee2299bb58b3f34bd6b24be1273a104361b39a24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 6 Dec 2018 09:39:42 +0100 Subject: cleanup for EL-8 --- php-phpunit-PHP-CodeCoverage.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/php-phpunit-PHP-CodeCoverage.spec b/php-phpunit-PHP-CodeCoverage.spec index 15e2793..954df8e 100644 --- a/php-phpunit-PHP-CodeCoverage.spec +++ b/php-phpunit-PHP-CodeCoverage.spec @@ -18,7 +18,7 @@ %global pear_channel pear.phpunit.de %global major 4.0 %global minor 8 -%global specrel 4 +%global specrel 5 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -44,7 +44,7 @@ BuildRequires: php-fedora-autoloader-devel # From composer.json, "require-dev": { # "phpunit/phpunit": "^5.7", # "ext-xdebug": "^2.1.4" -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) @@ -55,11 +55,7 @@ BuildRequires: (php-composer(sebastian/version) >= 1.0 with php- %else BuildRequires: php-phpunit-PHPUnit >= 5.7 BuildRequires: php-phpunit-File-Iterator >= 1.3 -%if 0%{?fedora} >= 25 -BuildRequires: php-phpunit-php-token-stream2 -%else BuildRequires: php-phpunit-PHP-TokenStream >= 1.4.2 -%endif BuildRequires: php-phpunit-Text-Template BuildRequires: php-sebastian-code-unit-reverse-lookup BuildRequires: php-phpunit-environment >= 1.3.2 @@ -81,7 +77,7 @@ BuildRequires: php-pecl-xdebug >= 2.4.0 Requires: php(language) >= 5.6 Requires: php-dom Requires: php-xmlwriter -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) @@ -90,11 +86,7 @@ Requires: (php-composer(sebastian/environment) >= 1.3.2 with php- 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-phpunit-php-token-stream2 -%else 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 @@ -169,7 +161,7 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd $EXT \ -d include_path=.:%{buildroot}%{php_home}:%{php_home} \ @@ -199,6 +191,9 @@ fi %changelog +* Thu Dec 6 2018 Remi Collet - 4.0.8-5 +- cleanup for EL-8 + * Fri Feb 2 2018 Remi Collet - 4.0.8-4 - use range dependency on F27+ -- cgit