From 7fd5cc5031a98ed1f7dff4dc50607514a725edbb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Dec 2017 08:32:51 +0100 Subject: Update to 2.7.0 raise dependency on PHP 5.6 raise dependency on zend-servicemanager 2.7.8 raise dependency on zend-stdlib 2.7.7 raise dependency on zend-validator 2.10.1 use phpunit6 on F26+ --- php-zendframework-zend-barcode.spec | 68 ++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 28 deletions(-) (limited to 'php-zendframework-zend-barcode.spec') diff --git a/php-zendframework-zend-barcode.spec b/php-zendframework-zend-barcode.spec index 2cd21e2..80a9d43 100644 --- a/php-zendframework-zend-barcode.spec +++ b/php-zendframework-zend-barcode.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 9201afb8a1356f149ddb955a3c9e017f47c0dd6c +%global gh_commit 50f24f604ef2172a0127efe91e786bc2caf2e8cf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-barcode @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 -Release: 5%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -30,28 +30,32 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://github.com/zendframework/zend-barcode/pull/36.patch - BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-dom BuildRequires: php-gd BuildRequires: php-iconv BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 # From composer, "require-dev": { -# "zendframework/zend-config": "^2.6", -# "zendframework/zendpdf": "*", -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0" +# "phpunit/phpunit": "^5.7.23 || ^6.4.3", +# "zendframework/zend-coding-standard": "~1.0.0", +# "zendframework/zend-config": "^2.6 || ^3.1", +# "zendframework/zendpdf": "^2.0.2" BuildRequires: php-autoloader(%{gh_owner}/zend-config) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zendpdf) -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +BuildRequires: php-autoloader(%{gh_owner}/zendpdf) >= 2.0.2 +%if 0%{?fedora} >= 26 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.4.3 +%else +%global phpunit %{_bindir}/phpunit +BuildRequires: php-composer(phpunit/phpunit) >= 5.7.22 +%endif # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif @@ -59,18 +63,18 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.5 || ^7.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0", -# "zendframework/zend-validator": "^2.6", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" -Requires: php(language) >= 5.5 +# "php": "^5.6 || ^7.0", +# "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", +# "zendframework/zend-stdlib": "^2.7.7 || ^3.1", +# "zendframework/zend-validator": "^2.10.1" +Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8 +Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6 +Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 Requires: php-autoloader(%{gh_owner}/zend-validator) < 3 -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 # From composer, "suggest": { # "zendframework/zendpdf": "ZendPdf component" %if 0%{?fedora} >= 21 @@ -103,7 +107,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -141,9 +144,10 @@ EOF export TESTS_ZEND_BARCODE_PDF_SUPPORT=1 ret=0 -for cmd in php php56 php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 fi done exit $ret @@ -161,6 +165,14 @@ exit $ret %changelog +* Tue Dec 12 2017 Remi Collet - 2.7.0-1 +- Update to 2.7.0 +- raise dependency on PHP 5.6 +- raise dependency on zend-servicemanager 2.7.8 +- raise dependency on zend-stdlib 2.7.7 +- raise dependency on zend-validator 2.10.1 +- use phpunit6 on F26+ + * Thu Dec 7 2017 Remi Collet - 2.6.0-5 - switch from zend-loader to fedora/autoloader - run PDF tests -- cgit