From 2119bee89a5dde7a2c8dd94a111b9a27ca61b3c1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Dec 2018 09:42:55 +0100 Subject: update to 3.2.1 use range dependencies --- php-zendframework-zend-test.spec | 55 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/php-zendframework-zend-test.spec b/php-zendframework-zend-test.spec index 5c4feb2..63212c2 100644 --- a/php-zendframework-zend-test.spec +++ b/php-zendframework-zend-test.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 626606425072e9d513df3bf723913c0bb9d03f8c +%global gh_commit 9f7d7db033cf2cdc316a0631b7f9b5dcad70d414 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-test @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -42,6 +42,19 @@ BuildRequires: phpunit7 # remirepo:1 %endif BuildRequires: php-pcre +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-console) >= 2.6 with php-autoloader(%{gh_owner}/zend-console) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-dom) >= 2.6 with php-autoloader(%{gh_owner}/zend-dom) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-uri) >= 2.5 with php-autoloader(%{gh_owner}/zend-uri) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3) +# remirepo:11 +%else BuildRequires: php-autoloader(%{gh_owner}/zend-console) >= 2.6 BuildRequires: php-autoloader(%{gh_owner}/zend-dom) >= 2.6 BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 @@ -51,6 +64,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 +%endif # From composer, "require-dev": { # "mikey179/vfsStream": "~1.2", # "symfony/finder": "^2.2", @@ -63,8 +77,20 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 # "zendframework/zend-serializer": "^2.6.1", # "zendframework/zend-session": "^2.8.5", # "zendframework/zend-validator": "^2.8" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(mikey179/vfsStream) >= 1.2 with php-composer(mikey179/vfsStream) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/zend-i18n) >= 2.6 with php-autoloader(%{gh_owner}/zend-i18n) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-log) >= 2.7.1 with php-autoloader(%{gh_owner}/zend-log) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/zend-modulemanager) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc-console) >= 1.1.8 with php-autoloader(%{gh_owner}/zend-mvc-console) < 2) +BuildRequires: php-autoloader(%{gh_owner}/zend-mvc-plugin-flashmessenger) >= 0.1.0 +BuildRequires: (php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-serializer) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.8 with php-autoloader(%{gh_owner}/zend-validator) < 3) +# remirepo:11 +%else BuildRequires: php-composer(mikey179/vfsStream) >= 1.2 -BuildRequires: php-symfony-finder BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.6 BuildRequires: php-autoloader(%{gh_owner}/zend-log) >= 2.7.1 BuildRequires: php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 @@ -74,6 +100,8 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1 BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.8 %endif +BuildRequires: php-symfony-finder +%endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -103,6 +131,22 @@ Recommends: php-composer(phpunit/phpunit) >= 4.0 %else Requires: php-composer(phpunit/phpunit) >= 4.0 %endif +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(sebastian/version) >= 1.0.4 with php-composer(sebastian/version) < 3) +%if ! %{bootstrap} +Requires: (php-autoloader(%{gh_owner}/zend-console) >= 2.6 with php-autoloader(%{gh_owner}/zend-console) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-dom) >= 2.6 with php-autoloader(%{gh_owner}/zend-dom) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-uri) >= 2.5 with php-autoloader(%{gh_owner}/zend-uri) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3) +%endif +# remirepo:24 +%else Requires: php-composer(sebastian/version) >= 1.0.4 Requires: php-composer(sebastian/version) < 3 %if ! %{bootstrap} @@ -125,6 +169,7 @@ Requires: php-autoloader(%{gh_owner}/zend-uri) < 3 Requires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 Requires: php-autoloader(%{gh_owner}/zend-view) < 3 %endif +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.5.1 @@ -244,6 +289,10 @@ exit $ret %changelog +* Tue Dec 11 2018 Remi Collet - 3.2.1-1 +- update to 3.2.1 +- use range dependencies + * Thu Apr 12 2018 Remi Collet - 3.2.0-1 - update to 3.2.0 - allow phpunit7 -- cgit