summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Form.spec25
1 files changed, 14 insertions, 11 deletions
diff --git a/php-horde-Horde-Form.spec b/php-horde-Horde-Form.spec
index 7e33995..1218b93 100644
--- a/php-horde-Horde-Form.spec
+++ b/php-horde-Horde-Form.spec
@@ -1,4 +1,3 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Horde_Form
%global pear_channel pear.horde.org
@@ -6,7 +5,7 @@
# Note : test not ready (old .phpt)
Name: php-horde-Horde-Form
-Version: 2.0.3
+Version: 2.0.4
Release: 1%{?dist}
Summary: Horde Form API
@@ -28,23 +27,23 @@ Requires: php-date
Requires: php-pcre
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Core) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Core) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Core) < 3.0.0
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_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_Nls) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Nls) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Nls) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Token) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Token) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Token) < 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}
@@ -118,6 +117,10 @@ fi
%changelog
+* Fri May 31 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+- switch from Conflicts >= max to Requires < max
+
* Tue Jan 29 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.0.3-1
- Update to 2.0.3 for remi repo