diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-zendframework-zend-mvc-plugin-flashmessenger.spec | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/composer.json b/composer.json index 2329b34..e2fbc26 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": "^5.6 || ^7.0", "zendframework/zend-mvc": "^3.0", "zendframework/zend-session": "^2.8.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-stdlib": "^3.2.1", "zendframework/zend-view": "^2.10" }, "require-dev": { @@ -45,8 +45,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1.x-dev", - "dev-develop": "1.2.x-dev" + "dev-master": "1.2.x-dev", + "dev-develop": "1.3.x-dev" }, "zf": { "component": "Zend\\Mvc\\Plugin\\FlashMessenger" diff --git a/php-zendframework-zend-mvc-plugin-flashmessenger.spec b/php-zendframework-zend-mvc-plugin-flashmessenger.spec index 77fa3f0..0fd58c8 100644 --- a/php-zendframework-zend-mvc-plugin-flashmessenger.spec +++ b/php-zendframework-zend-mvc-plugin-flashmessenger.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 1af2e2d69500da5ca31868c4817b6b7eb7e1cf47 +%global gh_commit b66064eb59d3b124a133d259aac3d9dd7cb81706 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-mvc-plugin-flashmessenger @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: Zend Framework Mvc-Plugin-%{library} component -Group: Development/Libraries License: BSD URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz @@ -34,19 +33,16 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 -BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.6.2 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.5 BuildRequires: php-spl # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", # "zendframework/zend-coding-standard": "~1.0.0", -# "zendframework/zend-i18n": "^2.8" +# "zendframework/zend-i18n": "^3.2.1" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4) BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.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-view) >= 2.10 with php-autoloader(%{gh_owner}/zend-view) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-i18n) >= 2.8 with php-autoloader(%{gh_owner}/zend-i18n) < 3) %global phpunit %{_bindir}/phpunit7 @@ -58,7 +54,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 BuildRequires: php-autoloader(%{gh_owner}/zend-view) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.10 BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) < 3 @@ -81,7 +77,7 @@ Requires: php(language) >= 5.6 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4) Requires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.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) Requires: (php-autoloader(%{gh_owner}/zend-view) >= 2.10 with php-autoloader(%{gh_owner}/zend-view) < 3) # remirepo:10 %else @@ -90,7 +86,7 @@ Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 Requires: php-autoloader(%{gh_owner}/zend-session) < 3 Requires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 Requires: php-autoloader(%{gh_owner}/zend-view) < 3 Requires: php-autoloader(%{gh_owner}/zend-view) >= 2.10 %endif @@ -152,7 +148,7 @@ require_once '%{buildroot}%{php_home}/Zend/Mvc/Plugin/%{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 @@ -173,6 +169,10 @@ exit $ret %changelog +* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1 +- update to 1.2.0 +- raise dependency on zend-stdlib 3.2.1 + * Thu May 3 2018 Remi Collet <remi@remirepo.net> - 1.1.0-1 - update to 1.1.0 - raise dependency on zend-session 2.8.5 |