summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-05-31 11:58:35 +0200
committerRemi Collet <fedora@famillecollet.com>2013-05-31 11:58:35 +0200
commit4722f03d0dba4a18268edaa1b2d2ef25d3ac9dd1 (patch)
tree790e8247e007bdb92215fa1174e88a9838792021
parentc155bd21f92a651f6ac34939f3b937e31494fe1d (diff)
php-horde-Horde-Itip: 2.0.5
-rw-r--r--php-horde-Horde-Itip.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/php-horde-Horde-Itip.spec b/php-horde-Horde-Itip.spec
index 4976c68..fd9d327 100644
--- a/php-horde-Horde-Itip.spec
+++ b/php-horde-Horde-Itip.spec
@@ -4,7 +4,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Itip
-Version: 2.0.4
+Version: 2.0.5
Release: 1%{?dist}
Summary: iTip invitation response handling
@@ -31,12 +31,12 @@ Requires: php-pcre
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Icalendar) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Icalendar) < 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_Mime) < 3.0.0
# Optional
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
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -118,6 +118,10 @@ fi
%changelog
+* Fri May 31 2013 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
+- Update to 2.0.5
+- switch from Conflicts to Requires
+
* Tue Feb 12 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
- Update to 2.0.4
- run test during build