From 91e99cec8ae91e50e33f34f90a1b2f18d76b99c9 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sat, 8 Jul 2017 20:57:11 -0400 Subject: Update to 3.1.10 (RHBZ #1449852) --- php-consolidation-output-formatters.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/php-consolidation-output-formatters.spec b/php-consolidation-output-formatters.spec index 8daa5d0..2ca54a3 100644 --- a/php-consolidation-output-formatters.spec +++ b/php-consolidation-output-formatters.spec @@ -12,8 +12,8 @@ %global github_owner consolidation-org %global github_name output-formatters -%global github_version 3.1.8 -%global github_commit 0b50ba1134d581fd55376f3e21508dab009ced47 +%global github_version 3.1.10 +%global github_commit 3872f19517bfc9da0e14c9e5b6fe0f8c7439ea3a %global composer_vendor consolidation %global composer_project output-formatters @@ -50,7 +50,7 @@ BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver} BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver} -## phpcompatinfo (computed from version 3.1.8) +## phpcompatinfo (computed from version 3.1.10) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-pcre @@ -66,7 +66,7 @@ Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} Requires: php-composer(symfony/finder) < %{symfony_max_ver} Requires: php-composer(symfony/finder) >= %{symfony_min_ver} -# phpcompatinfo (computed from version 3.1.8) +# phpcompatinfo (computed from version 3.1.10) Requires: php-dom Requires: php-json Requires: php-pcre @@ -132,9 +132,10 @@ rm -f tests/testAPIDocs.php : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php %{?rhel:php55} php56 php70 php71; do +PHPUNIT=$(which phpunit) +for PHP_EXEC in php %{?rhel:php55} php56 php70 php71 php72; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then - $PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php \ + $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 fi done @@ -154,6 +155,9 @@ exit $RETURN_CODE %changelog +* Sat Jul 08 2017 Shawn Iwinski - 3.1.10-1 +- Update to 3.1.10 (RHBZ #1449852) + * Sat Apr 08 2017 Shawn Iwinski - 3.1.8-1 - Update to 3.1.8 (RHBZ #1428197) - Allow Symfony 3 -- cgit