summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-07 08:47:13 +0100
committerRemi Collet <remi@remirepo.net>2019-01-07 08:47:13 +0100
commitf5eb3650782e8c76dee2e7d6c78da3df0b62e4cc (patch)
tree646da953c0bc8c2c1173ffeb916c1a443d5d39e9
parentce2a1f8709678ff463887e8c99e80477f616fd13 (diff)
update to 4.2.26
use range dependencies
-rw-r--r--php-horde-kronolith.spec51
1 files changed, 49 insertions, 2 deletions
diff --git a/php-horde-kronolith.spec b/php-horde-kronolith.spec
index f1198cc..b1f928e 100644
--- a/php-horde-kronolith.spec
+++ b/php-horde-kronolith.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-horde-kronolith
#
-# Copyright (c) 2012-2018 Remi Collet
+# Copyright (c) 2012-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -11,7 +11,7 @@
%global pear_channel pear.horde.org
Name: php-horde-kronolith
-Version: 4.2.25
+Version: 4.2.26
Release: 1%{?dist}
Summary: A web based calendar
@@ -25,9 +25,15 @@ 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
+%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.5.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.5.0
BuildRequires: php-pear(%{pear_channel}/content) >= 2.0.5
+%endif
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -45,6 +51,41 @@ Requires: php-pear(Date)
Requires: php-pear(Date_Holidays) >= 0.21.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_Autoloader) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Autoloader) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Core) >= 2.21.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.8 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_Date_Parser) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Date_Parser) < 3)
+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_Http) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Http) < 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_Image) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Image) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Lock) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Lock) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_LoginTasks) >= 2.0.0 with php-pear(%{pear_channel}/Horde_LoginTasks) < 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_Notification) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Notification) < 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_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_Text_Filter) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Text_Filter) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Timezone) >= 1.0.0 with php-pear(%{pear_channel}/Horde_Timezone) < 2)
+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.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_View) >= 2.0.0 with php-pear(%{pear_channel}/Horde_View) < 3)
+# From package.xml, optional
+Recommends: (php-pear(%{pear_channel}/nag) >= 4.2.0 with php-pear(%{pear_channel}/nag) < 5)
+%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
@@ -110,6 +151,7 @@ Requires: php-pear(%{pear_channel}/Horde_View) < 3.0.0
# From package.xml, optional
Requires: php-pear(%{pear_channel}/nag) >= 4.2.0
Requires: php-pear(%{pear_channel}/nag) < 5
+%endif
# Optional and implicitly required: Horde_Db
# Optional and skiped as non-free: Horde_ActiveSync
# TODO pear.horde.org/timeobjects >= 2.0.0
@@ -161,6 +203,7 @@ cd %{pear_name}-%{version}
# Remove checksum for .mo, as we regenerate them
sed -e '/%{pear_name}.po/d' \
-e '/htaccess/d' \
+ -e '/kronolith.patch/d' \
-e '/Event.php/s/md5sum=.*name=/name=/' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
@@ -261,6 +304,10 @@ fi
%changelog
+* Mon Jan 7 2019 Remi Collet <remi@remirepo.net> - 4.2.26-1
+- update to 4.2.26
+- use range dependencies
+
* Thu Sep 27 2018 Remi Collet <remi@remirepo.net> - 4.2.25-1
- update to 4.2.25