[php-horde-Horde-Date/el6] update to 2.0.6

[Remi Collet]

commit dcd07d07130880ff08650fa5531167340505afc2
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Jun 2 08:30:44 2013 +0200

    update to 2.0.6

 .gitignore                 |    1 +
 php-horde-Horde-Date.patch |  122 --------------------------------------------
 php-horde-Horde-Date.spec  |   20 +++----
 sources                    |    2 +-
 4 files changed, 11 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ce911e..2ffcb0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /Horde_Date-2.0.3.tgz
 /Horde_Date-2.0.4.tgz
 /Horde_Date-2.0.5.tgz
+/Horde_Date-2.0.6.tgz
diff --git a/php-horde-Horde-Date.spec b/php-horde-Horde-Date.spec
index 762cf5d..1d18d63 100644
--- a/php-horde-Horde-Date.spec
+++ b/php-horde-Horde-Date.spec
@@ -7,7 +7,7 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Date
-Version:        2.0.5
+Version:        2.0.6
 Release:        1%{?dist}
 Summary:        Horde Date package
 
@@ -16,9 +16,6 @@ License:        LGPLv2
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# preg_replace() /e is deprecated
-Patch0:         %{name}.patch
-
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -38,13 +35,13 @@ Requires:       php-spl
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 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_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_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_Util) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 # Optional and omited to avoid circular dependency: Horde_Icalendar
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -58,13 +55,10 @@ Package for creating and manipulating dates.
 
 cd %{pear_name}-%{version}
 
-%patch0 -p3 -b .callback
-
 # Don't install .po and .pot files
 # Remove checksum for .mo, as we regenerate them
 sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
-    -e '/Date.php/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
 
@@ -132,6 +126,10 @@ fi
 
 
 %changelog
+* Fri May 31 2013 Remi Collet <remi at fedoraproject.org> - 2.0.6-1
+- Update to 2.0.6
+- switch from Conflicts >= max to Requires < max
+
 * Wed May 08 2013 Remi Collet <remi at fedoraproject.org> - 2.0.5-1
 - Update to 2.0.5
 - upstream patch for preg_replace
diff --git a/sources b/sources
index 99e0398..1b5b666 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ad55ae61197fff82216b3020d84bc67  Horde_Date-2.0.5.tgz
+c18a7358bbbdb3707da7ee38de468330  Horde_Date-2.0.6.tgz