summaryrefslogtreecommitdiffstats
path: root/php-horde-Horde-Mime.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-05-31 10:48:55 +0200
committerRemi Collet <fedora@famillecollet.com>2013-05-31 10:48:55 +0200
commit9dc6bbd3cbb986e9135280fbc0436fcbb60e1cc8 (patch)
treed44a54c55a98f5af314a9bd4fe7390ffb93f1634 /php-horde-Horde-Mime.spec
parent716613c60bf820cf7cfa154d98a5a3431c644d37 (diff)
php-horde-Horde-Mime: 2.2.0
Diffstat (limited to 'php-horde-Horde-Mime.spec')
-rw-r--r--php-horde-Horde-Mime.spec24
1 files changed, 14 insertions, 10 deletions
diff --git a/php-horde-Horde-Mime.spec b/php-horde-Horde-Mime.spec
index 73d83f8..f60593b 100644
--- a/php-horde-Horde-Mime.spec
+++ b/php-horde-Horde-Mime.spec
@@ -6,7 +6,7 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: php-horde-Horde-Mime
-Version: 2.1.1
+Version: 2.2.0
Release: 1%{?dist}
Summary: Horde MIME Library
@@ -39,24 +39,24 @@ Requires: php-spl
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
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_Stream_Filter) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Stream_Filter) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Stream_Filter) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.1.0
-Conflicts: php-pear(%{pear_channel}/Horde_Support) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Text_Flowed) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Text_Flowed) < 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
# Optionnal
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_Text_Filter) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Text_Filter) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Text_Filter) < 3.0.0
Requires: php-intl
Requires: php-pear(Net_DNS2)
@@ -146,6 +146,10 @@ fi
%changelog
+* Fri May 31 2013 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- switch from Conflicts >= max to Requires < max
+
* Fri Apr 19 2013 Remi Collet <remi@fedoraproject.org> - 2.1.1-1
- Update to 2.1.1