[evolution/f18] Update to 3.6.4

[Milan Crha]

commit ebd784092164cad44808c878256fb057cf204a3d
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Mar 7 08:20:06 2013 +0100

    Update to 3.6.4

 .gitignore                        |    1 +
 evolution-3.6.2-restore.patch     |  136 ---------------------------------
 evolution-3.6.2-rhbug875109.patch |   40 ----------
 evolution-3.6.3-rhbug475117.patch |  150 -------------------------------------
 evolution-3.6.3-rhbug903469.patch |   46 -----------
 evolution.spec                    |   16 ++--
 sources                           |    2 +-
 7 files changed, 10 insertions(+), 381 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c2ba9b..1e3defa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.6.1.tar.xz
 /evolution-3.6.2.tar.xz
 /evolution-3.6.3.tar.xz
+/evolution-3.6.4.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 5cd0516..5d340d2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -3,7 +3,7 @@
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.30.2.1
 %define gtk3_version 3.2.0
-%define gtkhtml_version 4.3.1
+%define gtkhtml_version 4.6.4
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
@@ -28,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.6.3
-Release: 2%{?dist}
+Version: 3.6.4
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -49,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
-Patch03: evolution-3.6.3-rhbug475117.patch
-Patch04 :evolution-3.6.3-rhbug903469.patch
-
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -193,8 +190,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
-%patch03 -p1 -b .rhbug475117
-%patch04 -p1 -b .rhbug903469
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -533,6 +528,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Mar 07 2013 Milan Crha <mcrha at redhat.com> - 3.6.4-1
+- Update to 3.6.4
+- Remove patch for Red Hat bug #475117 (fixed upstream)
+- Remove patch for Red Hat bug #903469 (fixed upstream)
+
 * Thu Jan 24 2013 Milan Crha <mcrha at redhat.com> - 3.6.3-2
 - Add patch for Red Hat bug #475117 (Reply in multipart/digest)
 - Add patch for Red Hat bug #903469 (Formatting of text/* parts)
diff --git a/sources b/sources
index 2f1b895..7365daa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5662efe3f61da457cf6f9aae634bfbbf  evolution-3.6.3.tar.xz
+699c29a0179df3866ecc2f972bc626a4  evolution-3.6.4.tar.xz