From 40ab7047c7e62fefcb690e6f20065c6d6c5abde8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Feb 2018 16:21:52 +0100 Subject: use range dependencies on F27+ --- php-phpunit-mock-objects5.spec | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/php-phpunit-mock-objects5.spec b/php-phpunit-mock-objects5.spec index cbc28ed..c2aa639 100644 --- a/php-phpunit-mock-objects5.spec +++ b/php-phpunit-mock-objects5.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global bootstrap 1 +%global bootstrap 0 # Github %global gh_commit 33fd41a76e746b8fa96d00b49a23dadfa8334cdf #global gh_date 20150902 @@ -24,7 +24,7 @@ %global ver_major 5 %global ver_minor 0 %global ver_patch 6 -%global specrel 0 +%global specrel 2 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -50,12 +50,15 @@ BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with_tests} BuildRequires: php(language) >= 7.0 -BuildRequires: php-composer(phpunit/php-text-template) < 2 -BuildRequires: php-composer(phpunit/php-text-template) >= 1.2.1 -BuildRequires: php-composer(doctrine/instantiator) < 2 -BuildRequires: php-composer(doctrine/instantiator) >= 1.0.5 -BuildRequires: php-composer(sebastian/exporter) < 4 -BuildRequires: php-composer(sebastian/exporter) >= 3.1 +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) +BuildRequires: (php-composer(doctrine/instantiator) >= 1.0.5 with php-composer(doctrine/instantiator) < 2) +BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) +%else +BuildRequires: php-phpunit-Text-Template >= 1.2.1 +BuildRequires: php-doctrine-instantiator >= 1.0.5 +BuildRequires: php-sebastian-exporter3 >= 3.1 +%endif # From composer.json, "require-dev": { # "phpunit/phpunit": "^6.5" BuildRequires: phpunit6 >= 6.5 @@ -67,12 +70,15 @@ BuildRequires: phpunit6 >= 6.5 # "doctrine/instantiator": "^1.0.5", # "sebastian/exporter": "^3.1" Requires: php(language) >= 7.0 -Requires: php-composer(phpunit/php-text-template) >= 1.2.1 -Requires: php-composer(phpunit/php-text-template) < 2 -Requires: php-composer(doctrine/instantiator) >= 1.0.5 -Requires: php-composer(doctrine/instantiator) < 2 -Requires: php-composer(sebastian/exporter) >= 3.1 -Requires: php-composer(sebastian/exporter) < 4 +%if 0%{?fedora} >= 27 +Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) +Requires: (php-composer(doctrine/instantiator) >= 1.0.5 with php-composer(doctrine/instantiator) < 2) +Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) +%else +Requires: php-phpunit-Text-Template >= 1.2.1 +Requires: php-doctrine-instantiator >= 1.0.5 +Requires: php-sebastian-exporter3 >= 3.1 +%endif # From composer.json, "suggest": { # "ext-soap": "*" Requires: php-soap @@ -159,6 +165,9 @@ exit $ret %changelog +* Fri Feb 2 2018 Remi Collet - 5.0.6-2 +- use range dependencies on F27+ + * Sun Jan 7 2018 Remi Collet - 5.0.6-1 - Update to 5.0.6 - add upstream patch for test failure with PHP 7.0, see -- cgit