rpms/evolution-data-server/F-11 evolution-data-server-2.26.3-camel-vee-folder.patch, NONE, 1.1 evolution-data-server.spec, 1.262, 1.263

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14245

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.26.3-camel-vee-folder.patch 
Log Message:

* Tue Jul 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.3-2.fc11
- Add patch for RH bug #511079 (search folders hanging).


evolution-data-server-2.26.3-camel-vee-folder.patch:

--- NEW FILE evolution-data-server-2.26.3-camel-vee-folder.patch ---
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));
 


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-11/evolution-data-server.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- evolution-data-server.spec	29 Jun 2009 13:18:51 -0000	1.262
+++ evolution-data-server.spec	14 Jul 2009 18:13:08 -0000	1.263
@@ -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-ca
 # 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 document
 %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 at redhat.com> - 2.26.3-2.fc11
+- Add patch for RH bug #511079 (search folders hanging).
+
 * Mon Jun 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.3-1.fc11
 - Update to 2.26.3