From 5938684e32c4c745aba0d94ea8fa1d10557ad056 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Jan 2018 08:21:18 +0100 Subject: v2.8.1 --- php-zendframework-zend-inputfilter.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'php-zendframework-zend-inputfilter.spec') diff --git a/php-zendframework-zend-inputfilter.spec b/php-zendframework-zend-inputfilter.spec index b3c4a6a..fb0147b 100644 --- a/php-zendframework-zend-inputfilter.spec +++ b/php-zendframework-zend-inputfilter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit e7edd625f2fcdd72a719a7023114c5f4b4f38488 +%global gh_commit 55d1430db559e9781b147e73c2c0ce6635d8efe2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-inputfilter @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.0 +Version: 2.8.1 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -38,11 +38,10 @@ BuildRequires: php-spl BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.10.1 +BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.23 || ^6.4.3", -# "zendframework/zend-coding-standard": "~1.0.0", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 +# "zendframework/zend-coding-standard": "~1.0.0" %if 0%{?fedora} >= 26 %global phpunit %{_bindir}/phpunit6 %else @@ -58,6 +57,7 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 # "zendframework/zend-filter": "^2.6", # "zendframework/zend-stdlib": "^2.7 || ^3.0" # "zendframework/zend-validator": "^2.10.1", +# "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} Requires: php-composer(%{gh_owner}/zend-filter) >= 2.6 @@ -66,10 +66,11 @@ Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 Requires: php-composer(%{gh_owner}/zend-validator) >= 2.10.1 Requires: php-composer(%{gh_owner}/zend-validator) < 3 +Requires: php-composer(%{gh_owner}/zend-servicemanager) < 4 +Requires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.10 # From composer, "suggest": { # "zendframework/zend-servicemanager": "To support plugin manager support" %if 0%{?fedora} >= 21 -Suggests: php-composer(%{gh_owner}/zend-servicemanager) %endif %endif # From phpcompatinfo report for version 2.5.5 @@ -121,7 +122,7 @@ EOF # https://github.com/zendframework/zend-inputfilter/pull/141 sed -e 's/PHPUnit_Framework_TestCase/PHPUnit\\Framework\\TestCase/' -i test/ConfigProviderTest.php ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" php70 php71 php72; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 @@ -142,6 +143,10 @@ exit $ret %changelog +* Tue Jan 23 2018 Remi Collet - 2.8.1-1 +- Update to 2.8.1 +- add dependency on zend-servicemanager + * Tue Dec 5 2017 Remi Collet - 2.8.0-1 - Update to 2.8.0 - raise dependency on zend-validator 2.10.1 -- cgit