diff options
-rw-r--r-- | composer.json | 6 | ||||
-rw-r--r-- | php-zendframework-zend-router.spec | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 458b606..c4cade1 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require": { "php": "^5.6 || ^7.0", "container-interop/container-interop": "^1.2", - "zendframework/zend-http": "^2.6", + "zendframework/zend-http": "^2.8.1", "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", "zendframework/zend-stdlib": "^2.7.7 || ^3.1" }, @@ -50,8 +50,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1.x-dev", - "dev-develop": "3.2.x-dev" + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" }, "zf": { "component": "Zend\\Router", diff --git a/php-zendframework-zend-router.spec b/php-zendframework-zend-router.spec index 771d5e9..b1a627d 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 f5dbec5398ca98b35170716ec5146029197fe249 +%global gh_commit a80a7427afb8f736b9aeeb341a78dae855849291 %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.1.0 +Version: 3.2.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -39,7 +39,7 @@ BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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.6 with php-autoloader(%{gh_owner}/zend-http) < 3) +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) # remirepo:10 @@ -47,7 +47,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 with BuildRequires: php-composer(container-interop/container-interop) < 2 BuildRequires: php-composer(container-interop/container-interop) >= 1.2 BuildRequires: php-autoloader(%{gh_owner}/zend-http) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.5 +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 @@ -74,7 +74,7 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "container-interop/container-interop": "^1.2", -# "zendframework/zend-http": "^2.6", +# "zendframework/zend-http": "^2.8.1", # "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", # "zendframework/zend-stdlib": "^2.7.7 || ^3.1" Requires: php(language) >= 5.6 @@ -82,7 +82,7 @@ Requires: php(language) >= 5.6 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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.6 with php-autoloader(%{gh_owner}/zend-http) < 3) +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) # remirepo:10 @@ -90,7 +90,7 @@ Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 with Requires: php-composer(container-interop/container-interop) < 2 Requires: php-composer(container-interop/container-interop) >= 1.2 Requires: php-autoloader(%{gh_owner}/zend-http) < 3 -Requires: php-autoloader(%{gh_owner}/zend-http) >= 2.6 +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 @@ -172,6 +172,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 +# TODO 7.3 stdlib => "continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"? for cmdarg in "php %{phpunit}" php70 php71 php72; do if which $cmdarg; then set $cmdarg @@ -193,6 +194,10 @@ exit $ret %changelog +* Mon Aug 20 2018 Remi Collet <remi@remirepo.net> - 3.2.0-1 +- update to 3.2.0 +- raise dependency on zendframework/zend-http 2.8.1 + * Tue Jun 19 2018 Remi Collet <remi@remirepo.net> - 3.1.0-1 - update to 3.1.0 - raise dependency on PHP 5.6 |