update to 2.6.5HEADmaster

use range dependencies
enable test suite

1 files changed, 45 insertions, 8 deletions

diff --git a/php-horde-Horde-Mail.spec b/php-horde-Horde-Mail.spec
index 5363cb8..433dc41 100644
--- a/php-horde-Horde-Mail.spec
+++ b/php-horde-Horde-Mail.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-horde-Horde-Mail
 #
-# Copyright (c) 2012-2017 Nick Bebout, Remi Collet
+# Copyright (c) 2012-2019 Nick Bebout, Remi Collet
 #
 # License: MIT
 # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
@@ -10,16 +10,13 @@
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %global pear_name    Horde_Mail
 %global pear_channel pear.horde.org
-
-# Can run test because of circular dependency with Horde_Mime
-%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests   0%{!?_without_tests:1}
 
 Name:           php-horde-Horde-Mail
-Version:        2.6.4
+Version:        2.6.5
 Release:        1%{?dist}
 Summary:        Horde Mail Library
 
-Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
@@ -31,7 +28,30 @@ BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
 %if %{with_tests}
 # 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_Exception)     >= 2.0.0   with php-pear(%{pear_channel}/Horde_Exception)     < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Mime)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Mime)          < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Idna)          >= 1.0.0   with php-pear(%{pear_channel}/Horde_Idna)          < 2)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0   with php-pear(%{pear_channel}/Horde_Stream_Filter) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Translation)   >= 2.2.0   with php-pear(%{pear_channel}/Horde_Translation)   < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Util)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Util)          < 3)
+%else
+BuildRequires:  php-pear(%{pear_channel}/Horde_Test) <  3.0.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Mime) <  3.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Idna) >= 1.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Idna) <  2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Stream_Filter) <  3.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Util) <  3.0.0
+%endif
 %endif
 
 Requires(post): %{__pear}
@@ -40,6 +60,17 @@ 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_Mime)          >= 2.0.0   with php-pear(%{pear_channel}/Horde_Mime)          < 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_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(Net_SMTP) >= 1.6.0
+Recommends:     php-pear(Net_DNS2)
+%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_Mime) >= 2.0.0
@@ -55,6 +86,7 @@ Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 # From package.xml, optional
 Requires:       php-pear(Net_SMTP) >= 1.6.0
 Requires:       php-pear(Net_DNS2)
+%endif
 # From phpcompatinfo report for version 2.1.3
 Requires:       php-intl
 Requires:       php-pcre
@@ -119,9 +151,9 @@ done | tee ../%{pear_name}.lang
 %if %{with_tests}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php56 php70 php71 php72 php73; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose . || ret=1
+     $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1
   fi
 done
 exit $ret
@@ -151,6 +183,11 @@ fi
 
 
 %changelog
+* Sun Mar  3 2019 Remi Collet <remi@remirepo.net> - 2.6.5-1
+- update to 2.6.5
+- use range dependencies
+- enable test suite
+
 * Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 2.6.4-1
 - Update to 2.6.4
 - add locales