From 3677439cf298243c870b053c156231341f53dc2a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Dec 2019 15:52:08 +0100 Subject: sync with Fedora --- php-clue-block-react.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/php-clue-block-react.spec b/php-clue-block-react.spec index c5eadd8..4ba53a9 100644 --- a/php-clue-block-react.spec +++ b/php-clue-block-react.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Integrate async React PHP components into your blocking environment License: MIT @@ -49,7 +49,7 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: phpunit6 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver}) BuildRequires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver}) @@ -135,8 +135,8 @@ ln -s %{buildroot}%{phpdir}/Clue/React/Block/autoload.php vendor/autoload.php : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55 php70} php71 php72 php73; do +PHPUNIT=$(which phpunit6) +for PHP_EXEC in "" php71 php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose \ || RETURN_CODE=1 @@ -159,6 +159,9 @@ exit $RETURN_CODE %changelog +* Sat Dec 14 2019 Shawn Iwinski - 1.3.1-3 +- Use PHPUnit 6 + * Fri May 10 2019 Shawn Iwinski - 1.3.1-1 - Update to 1.3.1 (RHBZ #1697987) -- cgit