[evolution/f18] Update to 3.5.90

[Milan Crha]

commit 204d4a0a07beaa1336c698cb6d5831af9debb3f7
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Aug 20 11:52:54 2012 +0200

    Update to 3.5.90

 .gitignore                      |    1 +
 evolution-3.5.5-bgo678408.patch |   26 -----------------
 evolution-3.5.5-libxml2.patch   |   57 ---------------------------------------
 evolution.spec                  |   17 ++++-------
 sources                         |    2 +-
 5 files changed, 8 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cdbab75..7ff5008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.5.3.1.tar.xz
 /evolution-3.5.4.tar.xz
 /evolution-3.5.5.tar.xz
+/evolution-3.5.90.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 44ad2c0..1fc1285 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.5.5
-Release: 2%{?dist}
+Version: 3.5.90
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -49,13 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
-# BGO #678408: tiny pane used for non-multipart MIME mails. Upstream
-# commit ad93908, will be in Evo 3.5.90 - adamw
-Patch03: evolution-3.5.5-bgo678408.patch
-
-# Upstream ff88d1f11: fix build with new libxml2
-Patch04: evolution-3.5.5-libxml2.patch
-
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -196,8 +189,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 .bgo678408
-%patch04 -p1 -b .libxml2
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -534,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 20 2012 Milan Crha <mcrha at redhat.com> - 3.5.90-1
+- Update to 3.5.90
+- Remove patches for BGO #678408 and #681321 (fixed upstream)
+
 * Wed Aug 15 2012 Adam Williamson <awilliam at redhat.com> - 3.5.5-2
 - backport the fix for BGO #678408 and #681321 (libxml2 build)
 
diff --git a/sources b/sources
index 53994cb..c762f4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c285b52a46f89b43a32af022c1bbdc2  evolution-3.5.5.tar.xz
+4edb84ffa69c1dcb702c1c93a01c0130  evolution-3.5.90.tar.xz