From 6ca62733ea51340995634e85903abfd6264eb4f7 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sun, 10 Sep 2017 15:39:49 -0400 Subject: Updated to 1.4.1 (RHBZ #1482723) --- php-zendframework-zend-diactoros.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/php-zendframework-zend-diactoros.spec b/php-zendframework-zend-diactoros.spec index 0f4138c..94ea59d 100644 --- a/php-zendframework-zend-diactoros.spec +++ b/php-zendframework-zend-diactoros.spec @@ -12,8 +12,8 @@ %global github_owner zendframework %global github_name zend-diactoros -%global github_version 1.4.0 -%global github_commit b03f285a333f51e58c95cce54109a4a9ed691436 +%global github_version 1.4.1 +%global github_commit 424a840dc3bedcdeea510b42e056c77c2d6c4bef %global composer_vendor zendframework %global composer_project zend-diactoros @@ -53,7 +53,7 @@ BuildRequires: php-composer(psr/http-message) < %{psr_http_message_max_ver} BuildRequires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} BuildRequires: php-dom BuildRequires: php-libxml -## phpcompatinfo (computed from version 1.4.0) +## phpcompatinfo (computed from version 1.4.1) ### NOTE: curl, gd, gmp, and shmop are all optional for ### ZendTest\Diactoros\StreamTest::getResourceFor67() ### (test/StreamTest.php) but the first one found wins @@ -71,7 +71,7 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} Requires: php-composer(psr/http-message) < %{psr_http_message_max_ver} Requires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} -# phpcompatinfo (computed from version 1.4.0) +# phpcompatinfo (computed from version 1.4.1) Requires: php-json Requires: php-pcre Requires: php-spl @@ -145,9 +145,10 @@ sed 's/function testReasonPhraseDefaultsAgainstIana/function SKIP_testReasonPhra : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php %{?rhel:php55} php56 php70 php71; do - if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then - $PHP_EXEC %{_bindir}/phpunit --bootstrap bootstrap.php --verbose \ +PHPUNIT=$(which phpunit) +for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71 php72; do + if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC $PHPUNIT --bootstrap bootstrap.php --verbose \ || RETURN_CODE=1 fi done @@ -167,6 +168,9 @@ exit $RETURN_CODE %changelog +* Sun Sep 10 2017 Shawn Iwinski - 1.4.1-1 +- Updated to 1.4.1 (RHBZ #1482723) + * Sat Apr 08 2017 Shawn Iwinski - 1.4.0-1 - Updated to 1.4.0 (RHBZ #1440332) -- cgit