From 34b5b5b62c9c68fcf334bf942f92a5b28fd2795d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 May 2018 07:42:12 +0200 Subject: update to 2.8.2 use range dependencies on F27+ --- php-zendframework-zend-inputfilter.spec | 38 +++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/php-zendframework-zend-inputfilter.spec b/php-zendframework-zend-inputfilter.spec index eba1262..9da1bca 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 55d1430db559e9781b147e73c2c0ce6635d8efe2 +%global gh_commit 3f02179e014d9ef0faccda2ad6c65d38adc338d8 %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.1 +Version: 2.8.2 Release: 2%{?dist} Summary: Zend Framework %{library} component @@ -35,10 +35,23 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6 with php-autoloader(%{gh_owner}/zend-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +# remirepo:10 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 +%endif # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.23 || ^6.4.3", # "zendframework/zend-coding-standard": "~1.0.0" @@ -55,15 +68,24 @@ BuildRequires: php-fedora-autoloader-devel # "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6 with php-autoloader(%{gh_owner}/zend-filter) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +# remirepo:10 +%else Requires: php-autoloader(%{gh_owner}/zend-filter) < 3 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-autoloader(%{gh_owner}/zend-validator) < 3 +Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 %endif +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.5.5 @@ -138,6 +160,10 @@ exit $ret %changelog +* Tue May 15 2018 Remi Collet - 2.8.2-2 +- update to 2.8.2 +- use range dependencies on F27+ + * Tue Jan 23 2018 Remi Collet - 2.8.1-2 - Update to 2.8.1 - add dependency on zend-servicemanager -- cgit