- update to 4.2.24

- use range dependencies

1 files changed, 46 insertions, 2 deletions

diff --git a/php-horde-turba.spec b/php-horde-turba.spec
index 212b74e..4c041be 100644
--- a/php-horde-turba.spec
+++ b/php-horde-turba.spec
@@ -11,7 +11,7 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-turba
-Version:        4.2.23
+Version:        4.2.24
 Release:        1%{?dist}
 Summary:        A web based address book
 
@@ -25,9 +25,16 @@ BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
 BuildRequires:  php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
+# 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_Core)          >= 2.12.0 with php-pear(%{pear_channel}/Horde_Core)          < 3)
+BuildRequires: (php-pear(%{pear_channel}/content)             >= 2.0.5  with php-pear(%{pear_channel}/content)             < 3)
+%else
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Core) >= 2.12.0
 BuildRequires:  php-pear(%{pear_channel}/content) >= 2.0.5
+%endif
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -43,6 +50,38 @@ Requires:       php-json
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-pear(%{pear_channel}/content)             >= 2.0.5   with php-pear(%{pear_channel}/content)             < 3)
+Requires:      (php-pear(%{pear_channel}/horde)               >= 5.0.0   with php-pear(%{pear_channel}/horde)               < 6)
+Requires:      (php-pear(%{pear_channel}/Horde_Auth)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Auth)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Core)          >= 2.12.0  with php-pear(%{pear_channel}/Horde_Core)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Data)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Data)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Date)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Date)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Dav)           >= 1.0.0   with php-pear(%{pear_channel}/Horde_Dav)           < 2)
+Requires:      (php-pear(%{pear_channel}/Horde_Exception)     >= 2.0.0   with php-pear(%{pear_channel}/Horde_Exception)     < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Form)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Form)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Group)         >= 2.0.0   with php-pear(%{pear_channel}/Horde_Group)         < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_History)       >= 2.1.0   with php-pear(%{pear_channel}/Horde_History)       < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Icalendar)     >= 2.0.0   with php-pear(%{pear_channel}/Horde_Icalendar)     < 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.0.0   with php-pear(%{pear_channel}/Horde_Mime)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Nls)           >= 2.0.0   with php-pear(%{pear_channel}/Horde_Nls)           < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Perms)         >= 2.0.0   with php-pear(%{pear_channel}/Horde_Perms)         < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Prefs)         >= 2.0.0   with php-pear(%{pear_channel}/Horde_Prefs)         < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Serialize)     >= 2.0.0   with php-pear(%{pear_channel}/Horde_Serialize)     < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Share)         >= 2.0.0   with php-pear(%{pear_channel}/Horde_Share)         < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Support)       >= 2.0.0   with php-pear(%{pear_channel}/Horde_Support)       < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Url)           >= 2.0.0   with php-pear(%{pear_channel}/Horde_Url)           < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Util)          >= 2.5.0   with php-pear(%{pear_channel}/Horde_Util)          < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_Vfs)           >= 2.1.3   with php-pear(%{pear_channel}/Horde_Vfs)           < 3)
+Requires:      (php-pear(%{pear_channel}/Horde_View)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_View)          < 3)
+# Optional
+Recommends:    (php-pear(%{pear_channel}/Horde_Db)            >= 2.0.3   with php-pear(%{pear_channel}/Horde_Db)            < 3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Imsp)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Imsp)          < 3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Ldap)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Ldap)          < 3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Kolab_Format)  >= 2.0.5   with php-pear(%{pear_channel}/Horde_Kolab_Format)  < 3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Kolab_Storage) >= 2.1.0   with php-pear(%{pear_channel}/Horde_Kolab_Storage) < 3)
+%else
 Requires:       php-pear(%{pear_channel}/content) >= 2.0.5
 Requires:       php-pear(%{pear_channel}/content) <  3.0.0
 Requires:       php-pear(%{pear_channel}/horde) >= 5.0.0
@@ -94,6 +133,7 @@ Requires:       php-pear(%{pear_channel}/Horde_View) <  3.0.0
 # Optional an implicitly required
 #    Horde_Db, Horde_Imsp, Horde_Ldap
 #    Horde_Kolab_Format, Horde_Kolab_Storage
+%endif
 # Not yet available Horde_Service_Facebook
 # From phpcompatinfo report for version 4.1.4
 Requires:       php-date
@@ -178,7 +218,7 @@ sed -e 's/function testDuplicateDetectionFromAsWithNoEmail/function SKIP_testDup
     -i Unit/Driver/Base.php
 
 ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1
   fi
@@ -227,6 +267,10 @@ fi
 
 
 %changelog
+* Tue Apr 23 2019 Remi Collet <remi@remirepo.net> - 4.2.24-1
+- update to 4.2.24
+- use range dependencies
+
 * Mon Aug 20 2018 Remi Collet <remi@remirepo.net> - 4.2.23-1
 - update to 4.2.23