summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-09 10:25:03 +0100
committerRemi Collet <remi@remirepo.net>2021-03-09 10:25:03 +0100
commitd2dc6d47213422141978b3b1c934cb713da9a718 (patch)
tree8e978b163e0011c023973b12baaabb602fef0073
parent472c253e249235c9fe7dccbd0435b2c3a99cadf9 (diff)
use range dependenciesHEADmaster
-rw-r--r--.gitignore2
-rw-r--r--php-horde-Horde-Test.spec36
2 files changed, 26 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
package-*.xml
*.tgz
+*.tar.bz2
*.tar.gz
*.tar.xz
*.tar.xz.asc
diff --git a/php-horde-Horde-Test.spec b/php-horde-Horde-Test.spec
index b59c9d8..5b35d43 100644
--- a/php-horde-Horde-Test.spec
+++ b/php-horde-Horde-Test.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-horde-Horde-Test
#
-# Copyright (c) 2012-2017 Nick Bebout, Remi Collet
+# Copyright (c) 2012-2021 Nick Bebout, Remi Collet
#
# License: MIT
# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
@@ -12,11 +12,10 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Test
-Version: 2.6.3
-Release: 1%{?dist}
+Version: 2.6.4
+Release: 2%{?dist}
Summary: Horde testing base classes
-Group: Development/Libraries
License: LGPLv2
URL: http://%{pear_channel}
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
@@ -37,15 +36,22 @@ Requires: php-dom
Requires: php-json
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
-Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0
-Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-pear(%{pear_channel}/Horde_Support) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Support) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3)
# From package.xml, optional
-Requires: php-pear(%{pear_channel}/Horde_Cli) >= 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Cli) < 3.0.0
-Requires: php-pear(%{pear_channel}/Horde_Log) >= 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Log) < 3.0.0
+Recommends: (php-pear(%{pear_channel}/Horde_Cli) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Cli) < 3)
+Recommends: (php-pear(%{pear_channel}/Horde_Log) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Log) < 3)
+%else
+Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Requires: php-pear(%{pear_channel}/Horde_Cli) < 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Cli) >= 2.0.0
+Requires: php-pear(%{pear_channel}/Horde_Log) < 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Log) >= 2.0.0
+%endif
# From phpcompatinfo report for version 2.4.0
Requires: php-pcre
Requires: php-pdo
@@ -111,6 +117,12 @@ fi
%changelog
+* Tue Mar 9 2021 Remi Collet <remi@remirepo.net> - 2.6.4-2
+- use range dependencies
+
+* Mon Mar 16 2020 Remi Collet <remi@remirepo.net> - 2.6.4-1
+- update to 2.6.4 (no change)
+
* Wed May 3 2017 Remi Collet <remi@remirepo.net> - 2.6.3-1
- Update to 2.6.3