summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Data.spec21
1 files changed, 12 insertions, 9 deletions
diff --git a/php-horde-Horde-Data.spec b/php-horde-Horde-Data.spec
index 8d59c37..ae08b6f 100644
--- a/php-horde-Horde-Data.spec
+++ b/php-horde-Horde-Data.spec
@@ -1,10 +1,9 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Horde_Data
%global pear_channel pear.horde.org
Name: php-horde-Horde-Data
-Version: 2.0.3
+Version: 2.0.4
Release: 1%{?dist}
Summary: Horde Data API
@@ -31,19 +30,19 @@ Requires: php-spl
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Browser) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Browser) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Browser) < 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_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_Mail) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Mail) >= 3.0.0
+Requires: 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_Mime) < 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
Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -128,6 +127,10 @@ fi
%changelog
+* Fri May 31 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+- switch from Conflicts to Requires
+
* Tue Jan 29 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.0.3-1
- Update to 2.0.3 for remi repo