--- a/ChangeLog	Wed Jul 08 22:49:32 2009 +0000
+++ b/ChangeLog	Fri Jul 10 07:47:03 2009 +0000
@@ -1,3 +1,10 @@
+2009-07-10  Jeff Cai <[email protected]>
+
+	* base-specs/evolution-data-server.spec: 
+	* patches/evolution-data-server-02-open-address-book-sparc.diff:
+	* patches/evolution-data-server-03-local-start-hang.diff:
+	  Add two patches fix #6752 and #9913
+
 2009-07-08  Christian Kelly  <[email protected]>
 
 	* base-specs/glib2.spec, patches/glib-10-bad-return.diff: Bump to 2.21.3.

--- a/base-specs/evolution-data-server.spec	Wed Jul 08 22:49:32 2009 +0000
+++ b/base-specs/evolution-data-server.spec	Fri Jul 10 07:47:03 2009 +0000
@@ -23,6 +23,12 @@
 %endif
 # date:2006-09-28 owner:jefftsai type:branding
 Patch1:       evolution-data-server-01-libexec.diff
+%if %option_with_sun_branding
+# date:2009-03-11 owner:jefftsai doo:6752 bugster:6791003 type:bug
+Patch2:       evolution-data-server-02-open-address-book-sparc.diff
+%endif
+# date:2009-07-10 owner:jefftsai bugzilla:588220 doo:9913 type:bug
+Patch3:       evolution-data-server-03-local-start-hang.diff
 
 Docdir:       %{_defaultdocdir}/evolution-data-server
 Autoreqprov:  on
@@ -83,6 +89,10 @@
 sh -x %SOURCE1 --disable-gnu-extensions
 %endif
 %patch1 -p1
+%if %option_with_sun_branding
+%patch2 -p1
+%endif
+%patch3 -p1
 
 %build
 
@@ -184,6 +194,9 @@
 %{_datadir}/idl/*
 
 %changelog
+* Fri Jul 10 2009 - [email protected]
+- Add patch -03-local-start-hang, fix doo #9913, bugzill #588220
+- Add the old patch -02-open-address-book-sparc back removed by christian
 * Thu Jul 02 2009 - [email protected]
 - Remove references to evolution-data-server-02-open-address-book-sparc.
 * Tue Jun 16 2009 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-data-server-02-open-address-book-sparc.diff	Fri Jul 10 07:47:03 2009 +0000
@@ -0,0 +1,18 @@
+--- evolution-data-server-2.27.3/addressbook/backends/file/e-book-backend-file.c.orig	Fri Jun 12 20:20:12 2009
++++ evolution-data-server-2.27.3/addressbook/backends/file/e-book-backend-file.c	Tue Jun 16 17:50:47 2009
+@@ -1110,6 +1110,15 @@
+ 				(gpointer (*)(gpointer , gsize))g_try_realloc,
+ 				g_free);
+ 
++		if ((db_error = (*env->mutex_set_align)(env, 8))) { 
++			env->close(env, 0);
++			g_warning ("db_env_mutex_set_align failed with %s", db_strerror (db_error));
++			G_UNLOCK (global_env);
++			g_free (dirname);
++			g_free (filename);
++			return db_error_to_status (db_error);
++		}
++
+ 		db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
+ 		if (db_error != 0) {
+ 			env->close(env, 0);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-data-server-03-local-start-hang.diff	Fri Jul 10 07:47:03 2009 +0000
@@ -0,0 +1,27 @@
+--- evolution-data-server-2.27.3/camel/camel-db.c.orig	2009-07-10 14:13:35.305268000 +0800
++++ evolution-data-server-2.27.3/camel/camel-db.c	2009-07-10 14:14:09.727703000 +0800
+@@ -272,6 +272,12 @@
+ 	cFile->old_vfs_file = g_malloc0 (old_vfs->szOsFile);
+ 	cFile->queue = g_async_queue_new ();
+ 
++
++	res = old_vfs->xOpen (old_vfs, zPath, cFile->old_vfs_file, flags, pOutFlags);
++
++	if (res != SQLITE_OK)
++		return res;
++
+ 	/* Spawn a joinable thread to listen for sync requests. */
+ 	cFile->thread = g_thread_create (
+ 		(GThreadFunc) sync_request_thread_cb, cFile, TRUE, &error);
+@@ -280,11 +286,6 @@
+ 		g_error_free (error);
+ 	}
+ 
+-	res = old_vfs->xOpen (old_vfs, zPath, cFile->old_vfs_file, flags, pOutFlags);
+-
+-	if (res != SQLITE_OK)
+-		return res;
+-
+ 	g_static_rec_mutex_lock (&only_once_lock);
+ 
+ 	/* cFile->old_vfs_file->pMethods is NULL when open failed for some reason,