diff options
Diffstat (limited to 'php-clue-block-react.spec')
| -rw-r--r-- | php-clue-block-react.spec | 63 |
1 files changed, 39 insertions, 24 deletions
diff --git a/php-clue-block-react.spec b/php-clue-block-react.spec index 89be157..3031045 100644 --- a/php-clue-block-react.spec +++ b/php-clue-block-react.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-clue-block-react # -# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -11,25 +11,24 @@ # %global github_owner clue -%global github_name php-block-react -%global github_version 1.1.0 -%global github_commit ed70f8d497dd265e30bc7dd19cf86b2e149b1ecf +%global github_name reactphp-block +%global github_version 1.3.0 +%global github_commit a4a5cd64ded3b15affa168a2419fa4eda08b96aa %global composer_vendor clue %global composer_project block-react # "php": ">=5.3" %global php_min_ver 5.3 -# "react/event-loop": "0.4.*|0.3.*" -%global react_event_loop_min_ver 0.3 -%global react_event_loop_max_ver 0.5 -# "react/promise-timer": "~1.0" -%global react_promise_timer_min_ver 1.0 -%global react_promise_timer_max_ver 2.0 -# "react/promise": "~2.1|~1.2" -# NOTE: Min version not 1.2 to restrict to one major version -%global react_promise_min_ver 2.1 +# "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 +# "react/promise": "^2.7 || ^1.2.1" +%global react_promise_min_ver 1.2.1 %global react_promise_max_ver 3.0 +# "react/promise-timer": "^1.5" +%global react_promise_timer_min_ver 1.5 +%global react_promise_timer_max_ver 2.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -38,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Integrate async React PHP components into your blocking environment Group: Development/Libraries @@ -52,13 +51,19 @@ BuildArch: noarch ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) +%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}) +BuildRequires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver}) +%else BuildRequires: php-composer(react/event-loop) < %{react_event_loop_max_ver} BuildRequires: php-composer(react/event-loop) >= %{react_event_loop_min_ver} BuildRequires: php-composer(react/promise-timer) < %{react_promise_timer_max_ver} BuildRequires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} BuildRequires: php-composer(react/promise) < %{react_promise_max_ver} BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver} -## phpcompatinfo (computed from version 1.1.0) +%endif +## phpcompatinfo (computed from version 1.3.0) BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -66,13 +71,19 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver}) +Requires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver}) +Requires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver}) +%else Requires: php-composer(react/event-loop) < %{react_event_loop_max_ver} Requires: php-composer(react/event-loop) >= %{react_event_loop_min_ver} Requires: php-composer(react/promise-timer) < %{react_promise_timer_max_ver} Requires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} Requires: php-composer(react/promise) < %{react_promise_max_ver} Requires: php-composer(react/promise) >= %{react_promise_min_ver} -# phpcompatinfo (computed from version 1.1.0) +%endif +# phpcompatinfo (computed from version 1.3.0) Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -124,16 +135,15 @@ mkdir vendor ln -s %{buildroot}%{phpdir}/Clue/React/Block/autoload.php vendor/autoload.php : Upstream tests -%{_bindir}/phpunit --verbose - -: Upstream tests with SCLs if available -SCL_RETURN_CODE=0 -for SCL in %{?rhel:php54 php55} php56 php70 php71; do - if which $SCL; then - $SCL %{_bindir}/phpunit --verbose || SCL_RETURN_CODE=1 +RETURN_CODE=0 +PHPUNIT=$(which phpunit) +for PHP_EXEC in "" %{?rhel:php54 php55} php70 php71 php72 php73; do + if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC $PHPUNIT --verbose \ + || RETURN_CODE=1 fi done -exit $SCL_RETURN_CODE +exit $RETURN_CODE %else : Tests skipped %endif @@ -150,6 +160,11 @@ exit $SCL_RETURN_CODE %changelog +* Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 1.3.0-1 +- Update to 1.3.0 (RHBZ #1591266) +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 +- Add composer.json to repo + * Wed Jan 25 2017 Remi Collet <remi@remirepo.net> - 1.1.0-2 - backport for remi repo |