From ac8c32e5db79fe742a40c10c01e56b3e9d8ca328 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Aug 2017 17:13:56 +0200 Subject: v2.4.11 from Fedora --- composer.json | 2 +- php-consolidation-annotated-command.spec | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index ef3e6a2..6e7fa02 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "require": { "php": ">=5.4.0", - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.10", "psr/log": "^1", "symfony/console": "^2.8|~3", "symfony/event-dispatcher": "^2.5|^3", diff --git a/php-consolidation-annotated-command.spec b/php-consolidation-annotated-command.spec index 7674921..4d9145a 100644 --- a/php-consolidation-annotated-command.spec +++ b/php-consolidation-annotated-command.spec @@ -12,16 +12,16 @@ %global github_owner consolidation-org %global github_name annotated-command -%global github_version 2.4.8 -%global github_commit 6672ea38212f8bffb71fec7eadc8b3372154b17e +%global github_version 2.4.11 +%global github_commit 7fbf68dc6abf2f1f0746ceab0701dee1ee97516e %global composer_vendor consolidation %global composer_project annotated-command # "php": ">=5.4.0" %global php_min_ver 5.4.0 -# "consolidation/output-formatters": "^3.1.5" -%global consolidation_output_formatters_min_ver 3.1.5 +# "consolidation/output-formatters": "^3.1.10" +%global consolidation_output_formatters_min_ver 3.1.10 %global consolidation_output_formatters_max_ver 4 # "psr/log": "^1" # NOTE: Min version not 1.0 because autoloader required @@ -69,7 +69,7 @@ BuildRequires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver} BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver} -## phpcompatinfo (computed from version 2.4.8) +## phpcompatinfo (computed from version 2.4.11) BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-reflection @@ -92,7 +92,7 @@ Requires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} Requires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} Requires: php-composer(symfony/finder) < %{symfony_max_ver} Requires: php-composer(symfony/finder) >= %{symfony_min_ver} -# phpcompatinfo (computed from version 2.4.8) +# phpcompatinfo (computed from version 2.4.11) Requires: php-dom Requires: php-pcre Requires: php-reflection @@ -168,7 +168,7 @@ sed 's/function testInteractAndValidate/function SKIP_testInteractAndValidate/' : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php %{?rhel:php55} php56 php70 php71; do +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 \ || RETURN_CODE=1 @@ -190,6 +190,9 @@ exit $RETURN_CODE %changelog +* Sat Aug 05 2017 Shawn Iwinski - 2.4.11-1 +- Update to 2.4.11 (RHBZ #1473682) + * Sat Apr 08 2017 Shawn Iwinski - 2.4.8-1 - Update to 2.4.8 (RHBZ #1433641) - Allow Symfony 3 -- cgit