summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Alarm.spec26
1 files changed, 13 insertions, 13 deletions
diff --git a/php-horde-Horde-Alarm.spec b/php-horde-Horde-Alarm.spec
index a7ac3c0..4bab94a 100644
--- a/php-horde-Horde-Alarm.spec
+++ b/php-horde-Horde-Alarm.spec
@@ -3,7 +3,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Alarm
-Version: 2.0.4
+Version: 2.0.5
Release: 1%{?dist}
Summary: Horde Alarm Libraries
@@ -30,26 +30,23 @@ Requires: php-spl
BuildRequires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Date) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Date) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Translation) < 3.0.0
# Optional
Requires: php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Db) >= 3.0.0
-Requires: php-pear(%{pear_channel}/Horde_Log) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Log) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Db) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Mail) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Mail) >= 3.0.0
-Requires: php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Mime) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Mail) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Notification) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Notification) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Notification) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Perms) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Perms) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Prefs) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Prefs) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Prefs) < 3.0.0
+# Horde_Log, Horde_Mime optional and implicitly required
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -131,6 +128,9 @@ fi
%changelog
+* Tue Oct 22 2013 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
+- Update to 2.0.5
+
* Wed Mar 06 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
- Update to 2.0.4