From 5a3df5f6fd9bb19ba884912cea4bb6797f0f502c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Aug 2018 10:28:31 +0200 Subject: minor --- php-mockery.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/php-mockery.spec b/php-mockery.spec index 2b9759a..45a50e7 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -33,7 +33,7 @@ BuildArch: noarch # From composer.json, "require-dev": { # "phpunit/phpunit": "~5.7.10|~6.5", # "phpdocumentor/phpdocumentor": "^2.9" -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 BuildRequires: phpunit6 >= 6.5 %else @@ -41,7 +41,7 @@ BuildRequires: phpunit6 >= 6.5 BuildRequires: php-phpunit-PHPUnit >= 5.7.10 %endif BuildRequires: php(language) >= 5.6.0 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3) %else BuildRequires: php-hamcrest2 @@ -55,7 +55,7 @@ BuildRequires: php-fedora-autoloader-devel # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 5.6.0 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3) %else Requires: php-hamcrest2 @@ -114,7 +114,7 @@ phpab --output tests/classmap.php tests/Mockery/Stubs/ : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php70 php71 php72; do +for cmd in "php %{phpunit}" php70 php71 php72 php73; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit6} \ -- cgit