use range dependenciesHEADmaster

use weak dependencies, drop dependency on wddx

2 files changed, 49 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-horde-Horde-Serialize.spec b/php-horde-Horde-Serialize.spec
index 67f6aa5..3f33cfb 100644
--- a/php-horde-Horde-Serialize.spec
+++ b/php-horde-Horde-Serialize.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-horde-Horde-Serialize
 #
-# 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
@@ -13,36 +13,52 @@
 
 Name:           php-horde-Horde-Serialize
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        7%{?dist}
 Summary:        Data Encapulation API
 
-Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear
 BuildRequires:  php-channel(%{pear_channel})
 # 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)
+%else
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+%endif
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php(language) >= 5.3.0
-Requires:       php-bz2
-Requires:       php-json
-Requires:       php-wddx
-Requires:       php-zlib
-Requires:       php-pecl(LZF)
 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_Util)        >= 2.0.0  with php-pear(%{pear_channel}/Horde_Util)        <  3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Imap_Client) >= 2.0.0  with php-pear(%{pear_channel}/Horde_Imap_Client) <  3)
+Recommends:    (php-pear(%{pear_channel}/Horde_Mime)        >= 2.0.0  with php-pear(%{pear_channel}/Horde_Mime)        <  3)
+# Always there
+Recommends:     php-bz2
+Recommends:     php-json
+Recommends:     php-zlib
+# only suggested as removed in 7.4
+Suggests:       php-wddx
+Suggests:       php-lzf
+%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_Util) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
+Requires:       php-bz2
+Requires:       php-json
+Requires:       php-wddx
+Requires:       php-zlib
+Requires:       php-pecl(LZF)
 # Optional and skipped for build order: Horde_Imap_Client, Horde_Mime
+%endif
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 Provides:       php-composer(horde/horde-serialize) = %{version}
@@ -79,11 +95,17 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 %check
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 
-%{_bindir}/phpunit .
-
-if which php70; then
-   php70 %{_bindir}/phpunit .
-fi
+ret=0
+for cmd in php php70 php71 php72 php73; do
+  if which $cmd; then
+    if %{_bindir}/phpunit --atleast-version 4.8; then
+      $cmd %{_bindir}/phpunit --verbose . || ret=1
+    else
+     : PHPUnit is too old for this package
+    fi
+  fi
+done
+exit $ret
 
 
 %post
@@ -98,15 +120,18 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Serialize
 %{pear_phpdir}/Horde/Serialize.php
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Wed Mar 20 2019 Remi Collet <remi@fedoraproject.org> - 2.0.5-7
+- use range dependencies
+- use weak dependencies, drop dependency on wddx
+
 * Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
 - Update to 2.0.5
 - PHP 7 compatible version