From d1dcbbd71cc79d99c6c2a97358aa3df2333a1efe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 8 Feb 2019 11:12:57 +0100 Subject: update to 3.2.0 add dependency on zend-stdlib 3.2.1 --- composer.json | 7 +++--- php-zendframework-zendservice-recaptcha.spec | 36 +++++++++++++++++----------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index fb02219..0dd931e 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "require": { "php": "^5.6 || ^7.0", "zendframework/zend-http": "^2.5.4", - "zendframework/zend-json": "^2.6.1 || ^3.0" + "zendframework/zend-json": "^2.6.1 || ^3.0", + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", @@ -43,8 +44,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" } }, "scripts": { diff --git a/php-zendframework-zendservice-recaptcha.spec b/php-zendframework-zendservice-recaptcha.spec index e15191c..f50e08d 100644 --- a/php-zendframework-zendservice-recaptcha.spec +++ b/php-zendframework-zendservice-recaptcha.spec @@ -1,12 +1,12 @@ # remirepo/Fedora spec file for php-zendframework-zendservice-recaptcha # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 8caf28e3ab8c18d75534c0741ccd6949347d20e8 +%global gh_commit b21625c54f19ba5be5c90ab9fa167ca075cd1594 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project ZendService_ReCaptcha @@ -17,11 +17,10 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{pk_project} -Version: 3.1.0 -Release: 2%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component -Group: Development/Libraries License: BSD URL: https://framework.zend.com/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz @@ -32,27 +31,28 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-json -BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 -BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # From composer.json, "require-dev": { # "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", # "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-config": "^2.0", # "zendframework/zend-validator": "^2.8.2" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) BuildRequires: (php-autoloader(%{gh_owner}/zend-config) >= 2.0 with php-autoloader(%{gh_owner}/zend-config) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.8.2 with php-autoloader(%{gh_owner}/zend-validator) < 3) %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.1.5 -# remirepo:12 +# remirepo:14 %else BuildRequires: php-autoloader(%{gh_owner}/zend-http) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 BuildRequires: php-autoloader(%{gh_owner}/zend-json) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 BuildRequires: php-autoloader(%{gh_owner}/zend-config) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-config) >= 2.0 BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3 @@ -67,18 +67,22 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "zendframework/zend-http": "^2.5.4", -# "zendframework/zend-json": "^2.6.1 || ^3.0" +# "zendframework/zend-json": "^2.6.1 || ^3.0", +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) Requires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4) -# remirepo:6 +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:8 %else Requires: php-autoloader(%{gh_owner}/zend-http) < 3 Requires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 Requires: php-autoloader(%{gh_owner}/zend-json) < 4 Requires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 %endif # From compsoer, "suggest": { # "zendframework/zend-validator": "~2.0, if using ReCaptcha's Mailhide API" @@ -170,6 +174,10 @@ exit $ret %changelog +* Fri Feb 8 2019 Remi Collet - 3.2.0-1 +- update to 3.2.0 +- add dependency on zend-stdlib 3.2.1 + * Mon May 14 2018 Remi Collet - 3.1.0-2 - update to 3.1.0 - use range dependencies on F27+ -- cgit