diff options
| -rw-r--r-- | php-react-stream.spec | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/php-react-stream.spec b/php-react-stream.spec index 9b52bfe..60128a2 100644 --- a/php-react-stream.spec +++ b/php-react-stream.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-react-stream # -# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2019 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner reactphp %global github_name stream -%global github_version 0.7.7 -%global github_commit 10100896018fd847a257cd81143b8e1b7be08e40 +%global github_version 1.1.0 +%global github_commit 50426855f7a77ddf43b9266c22320df5bf6c6ce6 %global composer_vendor react %global composer_project stream @@ -24,9 +24,8 @@ %global clue_stream_filter_min_ver 1.2 %global clue_stream_filter_max_ver 2.0 # "evenement/evenement": "^3.0 || ^2.0 || ^1.0" -# NOTE: Restricted to one major version -%global evenement_min_ver 2.0 -%global evenement_max_ver 3.0 +%global evenement_min_ver 1.0 +%global evenement_max_ver 4.0 # "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5" %global react_event_loop_min_ver 0.3.5 %global react_event_loop_max_ver 2.0 @@ -41,7 +40,6 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: Basic readable and writable stream interfaces that support piping -Group: Development/Libraries License: MIT URL: https://reactphp.org/stream/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -51,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(clue/stream-filter) >= %{clue_stream_filter_min_ver} with php-composer(clue/stream-filter) < %{clue_stream_filter_max_ver}) BuildRequires: (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver}) @@ -64,7 +62,7 @@ BuildRequires: php-composer(evenement/evenement) >= %{evenement_min_ver} BuildRequires: php-composer(react/event-loop) < %{react_event_loop_max_ver} BuildRequires: php-composer(react/event-loop) >= %{react_event_loop_min_ver} %endif -# phpcompatinfo (computed from version 0.7.7) +# phpcompatinfo (computed from version 1.1.0) BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -81,7 +79,7 @@ Requires: php-composer(evenement/evenement) >= %{evenement_min_ver} Requires: php-composer(react/event-loop) < %{react_event_loop_max_ver} Requires: php-composer(react/event-loop) >= %{react_event_loop_min_ver} %endif -# phpcompatinfo (computed from version 0.7.7) +# phpcompatinfo (computed from version 1.1.0) Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -152,8 +150,8 @@ rm -f tests/FunctionalInternetTest.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 --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -174,6 +172,10 @@ exit $RETURN_CODE %changelog +* Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 1.1.0-1 +- Update to 1.1.0 (RHBZ #1600309) +- Use PHPUnit 6 + * Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 0.7.7-1 - Update to 0.7.7 (RHBZ #1431349) - Add range version dependencies for Fedora >= 27 || RHEL >= 8 |