diff --git a/.gitignore b/.gitignore index c59ad7b..d62a317 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /php-zendframework-zend-serializer-2.8.0-ff74ea0.tgz /php-zendframework-zend-serializer-2.8.1-7ac42b9.tgz +/php-zendframework-zend-serializer-2.9.0-0172690.tgz diff --git a/php-zendframework-zend-serializer.spec b/php-zendframework-zend-serializer.spec index f464413..ec6ee13 100644 --- a/php-zendframework-zend-serializer.spec +++ b/php-zendframework-zend-serializer.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-serializer # -# 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 7ac42b9a47e9cb23895173a3096bc3b3fb7ac580 +%global gh_commit 0172690db48d8935edaf625c4cba38b79719892c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-serializer @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.1 -Release: 3%{?dist} +Version: 2.9.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -39,41 +39,36 @@ BuildRequires: php-libxml BuildRequires: php-pcre BuildRequires: php-simplexml BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.5 # From composer, "require-dev": { -# "zendframework/zend-math": "^2.6", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "phpunit/phpunit": "^5.5", +# "phpunit/phpunit": "^5.7.25 || ^6.4.4", # "zendframework/zend-coding-standard": "~1.0.0", -# "doctrine/instantiator": "1.0.*" -BuildRequires: php-autoloader(%{gh_owner}/zend-math) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-composer(phpunit/phpunit) >= 5.5 +# "zendframework/zend-math": "^2.6 || ^3.0", +# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-json) >= 2.5 with php-autoloader(%{gh_owner}/zend-json) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-math) >= 2.6 with php-autoloader(%{gh_owner}/zend-math) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +BuildRequires: phpunit6 >= 6.4.4 +%endif # Autoloader BuildRequires: php-fedora-autoloader-devel -%endif # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0", # "zendframework/zend-json": "^2.5 || ^3.0" +# "zendframework/zend-stdlib": "^2.7 || ^3.0", Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 -Requires: php-composer(%{gh_owner}/zend-json) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-json) < 4 +Requires: (php-autoloader(%{gh_owner}/zend-json) >= 2.5 with php-autoloader(%{gh_owner}/zend-json) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # From composer, "suggest": { # "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization", # "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support" -%if 0%{?fedora} >= 21 Suggests: php-composer(%{gh_owner}/zend-math) Suggests: php-composer(%{gh_owner}/zend-servicemanager) Suggests: php-pecl(igbinary) Suggests: php-pecl(msgpack) %endif -%endif # From phpcompatinfo report for version 2.5.1 Requires: php-dom Requires: php-libxml @@ -132,9 +127,9 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 + $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi done exit $ret @@ -152,6 +147,11 @@ exit $ret %changelog +* Tue May 15 2018 Remi Collet - 2.9.0-2 +- update to 2.9.0 +- use range dependencies +- switch to phpunit6 + * Fri Feb 09 2018 Fedora Release Engineering - 2.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -195,4 +195,4 @@ exit $ret - normal build * Tue Aug 4 2015 Remi Collet - 2.5.1-0 -- initial package, bootstrap build \ No newline at end of file +- initial package, bootstrap build diff --git a/sources b/sources index 2636b99..77790c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zendframework-zend-serializer-2.8.1-7ac42b9.tgz) = a80aa95714165d73564225c66e9cf48a983fd5ba8d0f43f69293869044da0abf9cdc66925310400d1557f88fdf11bff24566a6244e6928570c83a2dd7731b10f +SHA512 (php-zendframework-zend-serializer-2.9.0-0172690.tgz) = c797f08235360196c997b1138e87bb8b022e1dd52a34bd4a5d287321aab775ab15cc4b94633f87a7b900b2d4a7f1409e66312d0869b00e43c4b9a7524d6fc5da