diff options
Diffstat (limited to 'php-react-stream.spec')
| -rw-r--r-- | php-react-stream.spec | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/php-react-stream.spec b/php-react-stream.spec index 60128a2..ed89440 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-2019 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2020 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 1.1.0 -%global github_commit 50426855f7a77ddf43b9266c22320df5bf6c6ce6 +%global github_version 1.1.1 +%global github_commit 7c02b510ee3f582c810aeccd3a197b9c2f52ff1a %global composer_vendor react %global composer_project stream @@ -33,24 +33,35 @@ # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} +# Range dependencies supported? +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%global with_range_dependencies 1 +%else +%global with_range_dependencies 0 +%endif + %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Basic readable and writable stream interfaces that support piping 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 + +# GitHub export does not include tests +# Run php-react-stream-get-source.sh to create full source +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh BuildArch: noarch # Tests %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: phpunit6 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: phpunit7 +%if %{with_range_dependencies} 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}) BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver}) @@ -62,7 +73,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 1.1.0) +# phpcompatinfo (computed from version 1.1.1) BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -70,7 +81,7 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%if %{with_range_dependencies} Requires: (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver}) Requires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver}) %else @@ -79,7 +90,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 1.1.0) +# phpcompatinfo (computed from version 1.1.1) Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -150,8 +161,8 @@ rm -f tests/FunctionalInternetTest.php : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit6) -for PHP_EXEC in "" php71 php72 php73 php74; do +PHPUNIT=$(which phpunit7) +for PHP_EXEC in "" php72 php73 php74 php80; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -172,6 +183,10 @@ exit $RETURN_CODE %changelog +* Sat Jun 06 2020 Shawn Iwinski <shawn@iwin.ski> - 1.1.1-1 +- Update to 1.1.1 (RHBZ #1830919) +- Use PHPUnit 7 + * Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 1.1.0-1 - Update to 1.1.0 (RHBZ #1600309) - Use PHPUnit 6 |