From afe7ba76ac54d5e7762499ed57ddd4a7671046f5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: May 03 2018 11:01:32 +0000 Subject: update to 1.1.0 raise dependency on zend-session 2.8.5 add dependency on zend-view use range dependencies switch to phpunit7 --- diff --git a/.gitignore b/.gitignore index 4e3241b..16a569d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-zendframework-zend-mvc-plugin-flashmessenger-1.0.0-712bffa.tgz +/php-zendframework-zend-mvc-plugin-flashmessenger-1.1.0-1af2e2d.tgz diff --git a/php-zendframework-zend-mvc-plugin-flashmessenger.spec b/php-zendframework-zend-mvc-plugin-flashmessenger.spec index 7c8e73f..0c388fd 100644 --- a/php-zendframework-zend-mvc-plugin-flashmessenger.spec +++ b/php-zendframework-zend-mvc-plugin-flashmessenger.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-mvc-plugin-flashmessenger # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-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 712bffa12c955a06d1e4303ab90026486b5b8586 +%global gh_commit 1af2e2d69500da5ca31868c4817b6b7eb7e1cf47 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-mvc-plugin-flashmessenger @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.0.0 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Zend Framework Mvc-Plugin-%{library} component Group: Development/Libraries @@ -39,9 +39,16 @@ 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": "^4.5", -# "squizlabs/php_codesniffer": "^2.3.1" -BuildRequires: php-composer(phpunit/phpunit) >= 4.5 +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", +# "zendframework/zend-coding-standard": "~1.0.0", +# "zendframework/zend-i18n": "^2.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-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 +BuildRequires: phpunit7 >= 7.1.4 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -49,15 +56,17 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "zendframework/zend-mvc": "^3.0", -# "zendframework/zend-session": "^2.6.2", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "zendframework/zend-session": "^2.8.5", +# "zendframework/zend-stdlib": "^2.7 || ^3.0", +# "zendframework/zend-view": "^2.10" Requires: php(language) >= 5.6 -Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 -Requires: php-autoloader(%{gh_owner}/zend-mvc) < 4 -Requires: php-autoloader(%{gh_owner}/zend-session) >= 2.6.2 -Requires: php-autoloader(%{gh_owner}/zend-session) < 3 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +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-view) >= 2.10 with php-autoloader(%{gh_owner}/zend-view) < 3) +# From composer, "suggests": { +# "zendframework/zend-i18n": "Zend\\I18n component" +Suggests: php-autoloader(%{gh_owner}/zend-i18n) # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 1.0.0 @@ -113,9 +122,10 @@ require_once '%{buildroot}%{php_home}/Zend/Mvc/Plugin/%{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 @@ -133,6 +143,13 @@ exit $ret %changelog +* Thu May 3 2018 Remi Collet - 1.1.0-1 +- update to 1.1.0 +- raise dependency on zend-session 2.8.5 +- add dependency on zend-view +- use range dependencies +- switch to phpunit7 + * Fri Feb 09 2018 Fedora Release Engineering - 1.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index e601b51..5cf1daf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5e97abfe7a0c282498c64fe870345c3 php-zendframework-zend-mvc-plugin-flashmessenger-1.0.0-712bffa.tgz +SHA512 (php-zendframework-zend-mvc-plugin-flashmessenger-1.1.0-1af2e2d.tgz) = 3a7900f18243b1e2f95ff38b5744a311a97e43aac2e3d2b5fcd9daaccce28ebb1f1eb6f9332e4d6d06e2a0bb32a4205c393c51f02ad0910283d050d2cd1891d6