From 954e427020ff0f19e905b3cd6262648bcb4bb8d2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Jun 2019 15:31:15 +0200 Subject: - update to 2.9.0 (no change) - raise dependency on zend-stdlib 3.2.1 --- composer.json | 6 +++--- php-zendframework-zend-captcha.spec | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index eea87fb..82db84e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^5.6 || ^7.0", "zendframework/zend-math": "^2.7 || ^3.0", - "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", @@ -50,8 +50,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "2.9.x-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "2.10.x-dev" } }, "scripts": { diff --git a/php-zendframework-zend-captcha.spec b/php-zendframework-zend-captcha.spec index 8bd6cfd..6f4a1e8 100644 --- a/php-zendframework-zend-captcha.spec +++ b/php-zendframework-zend-captcha.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-captcha # -# 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 bootstrap 0 -%global gh_commit 37e9b6a4f632a9399eecbf2e5e325ad89083f87b +%global gh_commit 4272f3d0cde0a1fa9135d0cbc4a629fb655391d3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-captcha @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -46,7 +46,7 @@ BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/zend-math) >= 2.7 with php-autoloader(%{gh_owner}/zend-math) < 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) BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8 with php-autoloader(%{gh_owner}/zend-session) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-text) >= 2.6 with php-autoloader(%{gh_owner}/zend-text) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) @@ -58,7 +58,7 @@ BuildRequires: phpunit7 >= 7.1.2 BuildRequires: php-autoloader(%{gh_owner}/zend-math) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-math) >= 2.7 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8 BuildRequires: php-autoloader(%{gh_owner}/zend-text) < 3 @@ -77,19 +77,19 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "zendframework/zend-math": "^2.7 || ^3.0", -# "zendframework/zend-stdlib": "^2.7.7 || ^3.1" +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-math) >= 2.7 with php-autoloader(%{gh_owner}/zend-math) < 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:6 %else Requires: php-autoloader(%{gh_owner}/zend-math) < 4 Requires: php-autoloader(%{gh_owner}/zend-math) >= 2.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-resources": "Translations of captcha messages", @@ -166,7 +166,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do +for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -187,6 +187,10 @@ exit $ret %changelog +* Tue Jun 18 2019 Remi Collet - 2.9.0-1 +- update to 2.9.0 (no change) +- raise dependency on zend-stdlib 3.2.1 + * Thu Apr 26 2018 Remi Collet - 2.8.0-2 - update to 2.8.0 - raise dependency on zend-math 2.7 -- cgit