update to 2.29.17

use range dependencies

1 files changed, 35 insertions, 4 deletions

diff --git a/php-horde-Horde-Imap-Client.spec b/php-horde-Horde-Imap-Client.spec
index 16918c0..70c0aca 100644
--- a/php-horde-Horde-Imap-Client.spec
+++ b/php-horde-Horde-Imap-Client.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-horde-Horde-Imap-Client
 #
-# Copyright (c) 2012-2018 Remi Collet
+# Copyright (c) 2012-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,7 +12,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:           php-horde-Horde-Imap-Client
-Version:        2.29.16
+Version:        2.29.17
 Release:        1%{?dist}
 Summary:        Horde IMAP abstraction interface
 
@@ -27,6 +27,15 @@ BuildRequires:  php-channel(%{pear_channel})
 BuildRequires:  gettext
 %if %{with_tests}
 # To run unit tests
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-pear(%{pear_channel}/Horde_Test)           >= 2.2.7   with php-pear(%{pear_channel}/Horde_Test)           < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Stream)         >= 1.4.0   with php-pear(%{pear_channel}/Horde_Stream)         < 2)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Mime)           >= 2.5.2   with php-pear(%{pear_channel}/Horde_Mime)           < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Cache)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Cache)          < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Pack)           >= 1.0.0   with php-pear(%{pear_channel}/Horde_Pack)           < 2)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Crypt_Blowfish) >= 1.1.0   with php-pear(%{pear_channel}/Horde_Crypt_Blowfish) < 2)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Stringprep)     >= 1.0.0   with php-pear(%{pear_channel}/Horde_Stringprep)     < 2)
+%else
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.2.7
 BuildRequires:  php-pear(%{pear_channel}/Horde_Stream) >= 1.4.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Mime) >= 2.5.2
@@ -35,6 +44,7 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Pack) >= 1.0.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Crypt_Blowfish) >= 1.1.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Stringprep) >= 1.0.0
 %endif
+%endif
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -45,6 +55,22 @@ Requires:       php-intl
 Requires:       php-json
 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_Mail)          >= 2.0.0    with php-pear(%{pear_channel}/Horde_Mail)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Mime)          >= 2.5.2    with php-pear(%{pear_channel}/Horde_Mime)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Secret)        >= 2.0.0    with php-pear(%{pear_channel}/Horde_Secret)        < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Socket_Client) >= 2.0.0    with php-pear(%{pear_channel}/Horde_Socket_Client) < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Stream)        >= 1.4.0    with php-pear(%{pear_channel}/Horde_Stream)        < 2)
+Requires:      (php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0    with php-pear(%{pear_channel}/Horde_Stream_Filter) < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Translation)   >= 2.2.0    with php-pear(%{pear_channel}/Horde_Translation)   < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Util)          >= 2.0.0    with php-pear(%{pear_channel}/Horde_Util)          < 3)
+# From package.xml, optional
+Recommends:    (php-pear(%{pear_channel}/Horde_Cache)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Cache)         < 3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Db)             >= 2.2.0   with php-pear(%{pear_channel}/Horde_Db)            < 3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Pack)           >= 1.0.0   with php-pear(%{pear_channel}/Horde_Pack)          < 2)
+Recommends:    (php-pear(%{pear_channel}/Horde_Stringprep)     >= 1.0.0   with php-pear(%{pear_channel}/Horde_Stringprep)    < 2)
+%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_Mail) >= 2.0.0
@@ -73,6 +99,8 @@ Requires:       php-pear(%{pear_channel}/Horde_Pack) >= 1.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Pack) <  2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Stringprep) >= 1.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Stringprep) <  2.0.0
+%endif
+Requires:       php-mbstring
 # From phpcompatinfo report for version 2.19.4
 Requires:       php-date
 Requires:       php-openssl
@@ -138,8 +166,7 @@ export LANG=fr_FR.utf8
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 
 ret=0
-# TODO 7.3 failures
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
   if which $cmd; then
     if %{_bindir}/phpunit --atleast-version 4.8; then
       $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1
@@ -178,6 +205,10 @@ fi
 
 
 %changelog
+* Sun Mar  3 2019 Remi Collet <remi@remirepo.net> - 2.29.17-1
+- update to 2.29.17
+- use range dependencies
+
 * Mon Jun 25 2018 Remi Collet <remi@remirepo.net> - 2.29.16-1
 - update to 2.29.16