From 77722ec6c166f84c5b7b252351912b5d30ada4da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 Dec 2018 07:30:31 +0100 Subject: use range dependencies --- php-horde-Horde-Text-Filter.spec | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec index 26f365e..1ed94a0 100644 --- a/php-horde-Horde-Text-Filter.spec +++ b/php-horde-Horde-Text-Filter.spec @@ -27,9 +27,15 @@ BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) BuildRequires: gettext # To run unit tests +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 with php-pear(%{pear_channel}/Horde_Test) < 3) +BuildRequires: (php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Text_Flowed) < 3) +BuildRequires: (php-pear(%{pear_channel}/Horde_Idna) >= 1.0.0 with php-pear(%{pear_channel}/Horde_Idna) < 2) +%else BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 BuildRequires: php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0 BuildRequires: php-pear(%{pear_channel}/Horde_Idna) >= 1.0.0 +%endif Requires(post): %{__pear} Requires(postun): %{__pear} @@ -37,6 +43,14 @@ Requires(postun): %{__pear} Requires: php(language) >= 5.3.0 Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Idna) >= 1.0.0 with php-pear(%{pear_channel}/Horde_Idna) < 2) +Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3) +# Optional +Recommends: php-tidy +Recommends: (php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Text_Flowed) < 3) +%else Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Idna) >= 1.0.0 @@ -47,6 +61,7 @@ Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0 Requires: php-tidy Requires: php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Text_Flowed) < 3.0.0 +%endif # From phpcompatinfo report for version 2.2.0 Requires: php-dom Requires: php-pcre @@ -151,6 +166,7 @@ fi * Mon Dec 31 2018 Remi Collet - 2.3.6-1 - update to 2.3.6 - drop patch merged upstream +- use range dependencies * Mon Oct 15 2018 Remi Collet - 2.3.5-6 - add patch for PHP 7.3 from https://github.com/horde/Text_Filter/pull/1 -- cgit