summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-react-promise.spec35
1 files changed, 19 insertions, 16 deletions
diff --git a/php-react-promise.spec b/php-react-promise.spec
index 8be8e8f..404a0b6 100644
--- a/php-react-promise.spec
+++ b/php-react-promise.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-react-promise
#
-# Copyright (c) 2014-2018 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2014-2019 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
%global github_owner reactphp
%global github_name promise
-%global github_version 2.7.0
-%global github_commit f4edc2581617431aea50430749db55cc3fc031b3
+%global github_version 2.7.1
+%global github_commit 31ffa96f8d2ed0341a57848cbb84d88b89dd664d
%global composer_vendor react
%global composer_project promise
@@ -31,7 +31,6 @@ Version: %{github_version}
Release: 1%{?github_release}%{?dist}
Summary: A lightweight implementation of CommonJS Promises/A for PHP
-Group: Development/Libraries
License: MIT
URL: https://reactphp.org/promise/
Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
@@ -42,7 +41,7 @@ BuildArch: noarch
BuildRequires: php-composer(phpunit/phpunit)
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-## phpcompatinfo (computed from version 2.7.0)
+## phpcompatinfo (computed from version 2.7.1)
BuildRequires: php-json
BuildRequires: php-reflection
BuildRequires: php-spl
@@ -52,7 +51,7 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 2.7.0)
+# phpcompatinfo (computed from version 2.7.1)
Requires: php-json
Requires: php-reflection
Requires: php-spl
@@ -65,6 +64,8 @@ Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
%description
A lightweight implementation of CommonJS Promises/A [1] for PHP.
+Autoloader: %{phpdir}/React/Promise/autoload.php
+
[1] http://wiki.commonjs.org/wiki/Promises/A
@@ -93,8 +94,8 @@ AUTOLOAD
%install
-mkdir -p %{buildroot}%{phpdir}/React/Promise
-cp -rp src/* %{buildroot}%{phpdir}/React/Promise/
+mkdir -p %{buildroot}%{phpdir}/React
+cp -rp src %{buildroot}%{phpdir}/React/Promise
%check
@@ -108,16 +109,15 @@ require_once '%{buildroot}%{phpdir}/React/Promise/autoload.php';
BOOTSTRAP
: Upstream tests
-%{_bindir}/phpunit --verbose --bootstrap ./bootstrap.php
-
-: Upstream tests with SCLs if available
-SCL_RETURN_CODE=0
-for SCL in php70 php71 php73 php73; do
- if which $SCL; then
- $SCL %{_bindir}/phpunit --bootstrap ./bootstrap.php || SCL_RETURN_CODE=1
+RETURN_CODE=0
+PHPUNIT=$(which phpunit)
+for PHP_EXEC in "" %{?rhel:php55 php70} php71 php72 php73 php74; do
+ if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
+ $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
+ || RETURN_CODE=1
fi
done
-exit $SCL_RETURN_CODE
+exit $RETURN_CODE
%else
: Tests skipped
%endif
@@ -133,6 +133,9 @@ exit $SCL_RETURN_CODE
%changelog
+* Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 2.7.1-1
+- Update to 2.7.1
+
* Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 2.7.0-1
- Update to 2.7.0 (RHBZ #1590046)
- Add composer.json to repo