From 5ee8653479010ea78076115f4c494e352a1f84b2 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jul 14 2009 18:13:08 +0000
Subject: - Add patch for RH bug #511079 (search folders hanging).


---

diff --git a/evolution-data-server-2.26.3-camel-vee-folder.patch b/evolution-data-server-2.26.3-camel-vee-folder.patch
new file mode 100644
index 0000000..f9d9c85
--- /dev/null
+++ b/evolution-data-server-2.26.3-camel-vee-folder.patch
@@ -0,0 +1,20 @@
+diff -up evolution-data-server-2.26.3/camel/camel-vee-folder.c.camel-vee-folder evolution-data-server-2.26.3/camel/camel-vee-folder.c
+--- evolution-data-server-2.26.3/camel/camel-vee-folder.c.camel-vee-folder	2009-06-26 08:36:57.000000000 -0400
++++ evolution-data-server-2.26.3/camel/camel-vee-folder.c	2009-07-14 14:10:51.000000000 -0400
+@@ -1533,12 +1533,14 @@ folder_changed_change(CamelSession *sess
+ 	}
+ 
+ 	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
+-	if (matches_changed || matches_added || changes->uid_removed->len||present)
+-		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
+ 
+ 	if (folder_unmatched != NULL)
+ 		CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
+ 
++	if (matches_changed || matches_added || changes->uid_removed->len||present)
++		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
++
++
+ 	dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder->full_name, sub->full_name));
+ 	dd(printf(" changed %u added %u removed %u\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 78e7bcf..39bba5d 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -31,7 +31,7 @@
 
 Name: evolution-data-server
 Version: 2.26.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -53,6 +53,9 @@ Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# RH bug 511079 / GNOME bug #583507
+Patch13: evolution-data-server-2.26.3-camel-vee-folder.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -136,6 +139,7 @@ This package contains developer documentation for %{name}.
 %patch10 -p1 -b .fix-ldap-query
 %patch11 -p1 -b .camel-folder-summary-crash
 %patch12 -p1 -b .fix-64bit-acinclude
+%patch13 -p1 -b .camel-vee-folder
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -381,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Tue Jul 14 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.3-2.fc11
+- Add patch for RH bug #511079 (search folders hanging).
+
 * Mon Jun 29 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.3-1.fc11
 - Update to 2.26.3