From b39816583fa45c0a6c0772631d104cdb3770cd8b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 May 2018 06:55:54 +0200 Subject: use range dependencies --- php-tecnickcom-tc-lib-barcode.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/php-tecnickcom-tc-lib-barcode.spec b/php-tecnickcom-tc-lib-barcode.spec index 6e31172..ed7af72 100644 --- a/php-tecnickcom-tc-lib-barcode.spec +++ b/php-tecnickcom-tc-lib-barcode.spec @@ -26,14 +26,19 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch %if %{with_tests} # For tests -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit7 %else %global phpunit %{_bindir}/phpunit %endif BuildRequires: %{phpunit} BuildRequires: php(language) >= 5.4 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 with php-composer(%{c_vendor}/tc-lib-color) < 2) +%else +BuildRequires: php-composer(%{c_vendor}/tc-lib-color) < 2 BuildRequires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 +%endif BuildRequires: php-bcmath BuildRequires: php-date BuildRequires: php-gd @@ -54,8 +59,12 @@ Requires: php-bcmath Requires: php-date Requires: php-gd Requires: php-pcre -Requires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 with php-composer(%{c_vendor}/tc-lib-color) < 2) +%else Requires: php-composer(%{c_vendor}/tc-lib-color) < 2 +Requires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 +%endif # From phpcompatinfo report for version 1.15.5 # none @@ -136,6 +145,7 @@ exit $ret * Mon May 14 2018 Remi Collet - 1.15.10-1 - update to 1.15.10 (no change) - switch to phpunit7 +- use range dependencies * Sat Apr 21 2018 Remi Collet - 1.15.8-1 - update to 1.15.8 -- cgit