diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-zendframework-zend-authentication.spec | 49 |
2 files changed, 43 insertions, 12 deletions
diff --git a/composer.json b/composer.json index a6804e5..2ebe04f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require": { "php": "^5.6 || ^7.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", @@ -57,8 +57,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.6.x-dev", - "dev-develop": "2.7.x-dev" + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" } }, "scripts": { diff --git a/php-zendframework-zend-authentication.spec b/php-zendframework-zend-authentication.spec index c89991b..d244627 100644 --- a/php-zendframework-zend-authentication.spec +++ b/php-zendframework-zend-authentication.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-authentication # -# 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 ebc9464c11a5203e5256439f1079a7d6efe89eec +%global gh_commit 1f379f6384fca34b3bfe94d953abd65e9e7ee746 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-authentication @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?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 @@ -39,7 +38,9 @@ BuildRequires: php-date BuildRequires: php-hash BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", # "zendframework/zend-coding-standard": "~1.0.0", @@ -50,13 +51,32 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 # "zendframework/zend-session": "^2.8", # "zendframework/zend-uri": "^2.5.2", # "zendframework/zend-validator": "^2.10.1" +BuildRequires: (php-autoloader(%{gh_owner}/zend-db) >= 2.8.2 with php-autoloader(%{gh_owner}/zend-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-crypt) >= 2.6 with php-autoloader(%{gh_owner}/zend-crypt) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.7 with php-autoloader(%{gh_owner}/zend-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-ldap) >= 2.8 with php-autoloader(%{gh_owner}/zend-ldap) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8 with php-autoloader(%{gh_owner}/zend-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/zend-uri) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) +# remirepo:18 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-db) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-db) >= 2.8.2 +BuildRequires: php-autoloader(%{gh_owner}/zend-crypt) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-crypt) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-http) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-ldap) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-ldap) >= 2.8 +BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8 +BuildRequires: php-autoloader(%{gh_owner}/zend-uri) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5.2 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +%endif # remirepo:1 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit7 @@ -71,11 +91,12 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-stdlib": "^2.7.7 || ^3.1" +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # From composer, "suggest": { # "zendframework/zend-db": "Zend\\Db component", # "zendframework/zend-crypt": "Zend\\Crypt component", @@ -91,6 +112,11 @@ Suggests: php-autoloader(%{gh_owner}/zend-ldap) Suggests: php-autoloader(%{gh_owner}/zend-session) Suggests: php-autoloader(%{gh_owner}/zend-uri) Suggests: php-autoloader(%{gh_owner}/zend-validator) +# remirepo:4 +%else +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +%endif %endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -175,6 +201,11 @@ exit $ret %changelog +* Wed May 15 2019 Remi Collet <remi@remirepo.net> - 2.7.0-1 +- update to 2.7.0 +- raise dependency on zend-stdlib 3.2.1 +- use range dependencies + * Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 2.6.0-2 - update to 2.6.0 - raise dependency on PHP 5.6 |