diff options
Diffstat (limited to 'php-zendframework-zend-captcha.spec')
| -rw-r--r-- | php-zendframework-zend-captcha.spec | 82 |
1 files changed, 57 insertions, 25 deletions
diff --git a/php-zendframework-zend-captcha.spec b/php-zendframework-zend-captcha.spec index a1705ea..8bd6cfd 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-2017 Remi Collet +# Copyright (c) 2015-2018 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 2d56293a5ae3e45e7c8ee7030aa8b305768d8014 +%global gh_commit 37e9b6a4f632a9399eecbf2e5e325ad89083f87b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-captcha @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.1 -Release: 3%{?dist} +Version: 2.8.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component -Group: Development/Libraries License: BSD URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz @@ -37,48 +36,73 @@ BuildRequires: php(language) >= 5.6 BuildRequires: php-date BuildRequires: php-gd BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-math) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 # From composer, "require-dev": { -# "zendframework/zend-session": "^2.6", -# "zendframework/zend-text": "^2.6", -# "zendframework/zend-validator": "^2.6", -# "zendframework/zendservice-recaptcha": "^3.0", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", # "zendframework/zend-coding-standard": "~1.0.0", -# "phpunit/PHPUnit": "~4.8" -BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-text) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6 +# "zendframework/zend-session": "^2.8", +# "zendframework/zend-text": "^2.6", +# "zendframework/zend-validator": "^2.10.1", +# "zendframework/zendservice-recaptcha": "^3.0" +# 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-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) +BuildRequires: (php-autoloader(%{gh_owner}/zendservice-recaptcha) >= 3.0 with php-autoloader(%{gh_owner}/zendservice-recaptcha) < 4) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.2 +# remirepo:16 +%else +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-session) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8 +BuildRequires: php-autoloader(%{gh_owner}/zend-text) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-text) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +BuildRequires: php-autoloader(%{gh_owner}/zendservice-recaptcha) < 4 BuildRequires: php-autoloader(%{gh_owner}/zendservice-recaptcha) >= 3.0 -BuildRequires: php-composer(phpunit/phpunit) >= 4.8 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.5.8 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-math": "^2.6 || ^3.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "zendframework/zend-math": "^2.7 || ^3.0", +# "zendframework/zend-stdlib": "^2.7.7 || ^3.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-math) >= 2.6 +# 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) +# remirepo:6 +%else Requires: php-autoloader(%{gh_owner}/zend-math) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +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 +%endif # From composer, "suggest": { # "zendframework/zend-i18n-resources": "Translations of captcha messages", # "zendframework/zend-session": "Zend\\Session component", # "zendframework/zend-text": "Zend\\Text component", # "zendframework/zend-validator": "Zend\\Validator component", # "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component" -%if 0%{?fedora} >= 21 Suggests: php-autoloader(%{gh_owner}/zend-i18n-resources) Suggests: php-autoloader(%{gh_owner}/zend-session) Suggests: php-autoloader(%{gh_owner}/zend-text) Suggests: php-autoloader(%{gh_owner}/zend-validator) Suggests: php-autoloader(%{gh_owner}/zendservice-recaptcha) %endif -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.5.2 @@ -142,9 +166,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit || ret=1 +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -162,6 +187,13 @@ exit $ret %changelog +* Thu Apr 26 2018 Remi Collet <remi@remirepo.net> - 2.8.0-2 +- update to 2.8.0 +- raise dependency on zend-math 2.7 +- raise dependency on zend-stdlib 2.7.7 +- switch to phpunit6 or phpunit7 +- use range dependencies on F27+ + * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.7.1-3 - switch from zend-loader to fedora/autoloader |