From 12a42a688c420d860500403fd9f46d1b7d131e8a Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Aug 06 2012 07:12:33 +0000
Subject: Update to 3.5.5


---

diff --git a/.gitignore b/.gitignore
index 22f5329..c5e32b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-3.5.3.tar.xz
 /evolution-data-server-3.5.3.1.tar.xz
 /evolution-data-server-3.5.4.tar.xz
+/evolution-data-server-3.5.5.tar.xz
diff --git a/evolution-data-server-3.5.4-vtrash-mem.patch b/evolution-data-server-3.5.4-vtrash-mem.patch
deleted file mode 100644
index 976da91..0000000
--- a/evolution-data-server-3.5.4-vtrash-mem.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
-index c46cea0..bc4fd99 100644
---- a/camel/camel-vee-folder.c
-+++ b/camel/camel-vee-folder.c
-@@ -276,6 +276,13 @@ vee_folder_merge_matching (CamelVeeFolder *vfolder,
- 		g_object_unref (mi_data);
- 	}
- 
-+	/* Not a real search folder influencing Unmatched folder, thus skip it.
-+	   The removal requires CamelVeeMessageInfoData, which is added on demand
-+	   to CamelVeeDataCache, thus even the virtual trash/junk folder doesn't
-+	   need it, it is left in the data_cache since then on */
-+	if (!vfolder->priv->parent_vee_store)
-+		return;
-+
- 	rud.vfolder = vfolder;
- 	rud.vsummary = vsummary;
- 	rud.subfolder = subfolder;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index fe4fbc1..2982ddc 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -26,8 +26,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.5.4
-Release: 3%{?dist}
+Version: 3.5.5
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -43,8 +43,6 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch02: evolution-data-server-3.5.4-vtrash-mem.patch
-
 ### Build Dependencies ###
 
 BuildRequires: bison
@@ -125,7 +123,6 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
-%patch02 -p1 -b .vtrash-mem
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -370,6 +367,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Aug 06 2012 Milan Crha <mcrha@redhat.com> - 3.5.5-1
+- Update to 3.5.5
+- Remove patch for less memory usage from vTrash camel folders (fixed upstream)
+
 * Thu Jul 26 2012 Milan Crha <mcrha@redhat.com> - 3.5.4-3
 - Add patch for less memory usage from vTrash camel folders
 
diff --git a/sources b/sources
index 86871dd..ef50f50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b676b7800d74d8b391da0b8b94babff  evolution-data-server-3.5.4.tar.xz
+d3cd3501431d3ae6fcd1ef734ba5e021  evolution-data-server-3.5.5.tar.xz