From 5a6b86fce34ae8de2c7bd90c93f1c865d1758b23 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Feb 2019 12:04:06 +0100 Subject: update to 3.3.0 (no change) raise dependency on zendframework/zend-stdlib 3.2.1 --- composer.json | 6 +++--- php-zendframework-zend-router.spec | 18 +++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index c4cade1..3973ec8 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "container-interop/container-interop": "^1.2", "zendframework/zend-http": "^2.8.1", "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", - "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^5.7.22 || ^6.4.1", @@ -50,8 +50,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.2.x-dev", - "dev-develop": "3.3.x-dev" + "dev-master": "3.3.x-dev", + "dev-develop": "4.0.x-dev" }, "zf": { "component": "Zend\\Router", diff --git a/php-zendframework-zend-router.spec b/php-zendframework-zend-router.spec index eb67a87..00adce9 100644 --- a/php-zendframework-zend-router.spec +++ b/php-zendframework-zend-router.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit e2151a72e9d00b1962c26469bab50db66cf7ef14 +%global gh_commit b113a4cfd910ee4723079fa58a9bcf3198631620 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-router @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.2.1 +Version: 3.3.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -40,7 +40,7 @@ BuildRequires: php-spl BuildRequires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.8.1 with php-autoloader(%{gh_owner}/zend-http) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.7 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # remirepo:10 %else BuildRequires: php-composer(container-interop/container-interop) < 2 @@ -50,7 +50,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.8.1 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 %endif # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.22 || ^6.4.1", @@ -75,7 +75,7 @@ BuildRequires: php-fedora-autoloader-devel # "container-interop/container-interop": "^1.2", # "zendframework/zend-http": "^2.8.1", # "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", -# "zendframework/zend-stdlib": "^2.7.7 || ^3.1" +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} # remirepo:1 @@ -83,7 +83,7 @@ Requires: php(language) >= 5.6 Requires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) Requires: (php-autoloader(%{gh_owner}/zend-http) >= 2.8.1 with php-autoloader(%{gh_owner}/zend-http) < 3) Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.7 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # remirepo:10 %else Requires: php-composer(container-interop/container-interop) < 2 @@ -93,7 +93,7 @@ Requires: php-autoloader(%{gh_owner}/zend-http) >= 2.8.1 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.7 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 %endif # From composer, "suggest": { # "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments" @@ -192,6 +192,10 @@ exit $ret %changelog +* Wed Feb 27 2019 Remi Collet - 3.3.0-1 +- update to 3.3.0 (no change) +- raise dependency on zendframework/zend-stdlib 3.2.1 + * Mon Feb 11 2019 Remi Collet - 3.2.1-1 - update to 3.2.1 -- cgit