From a4b6a127c5936934e0f1fa97f1e19f0d95029956 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jan 23 2008 15:43:43 +0000
Subject: - Add patch for RH bug #278171 (crash on shutdown).


---

diff --git a/evolution-data-server-1.12.3-camel-shutdown.patch b/evolution-data-server-1.12.3-camel-shutdown.patch
new file mode 100644
index 0000000..4b2b248
--- /dev/null
+++ b/evolution-data-server-1.12.3-camel-shutdown.patch
@@ -0,0 +1,35 @@
+diff -up evolution-data-server-1.12.3/camel/camel.c.camel-shutdown evolution-data-server-1.12.3/camel/camel.c
+--- evolution-data-server-1.12.3/camel/camel.c.camel-shutdown	2007-10-12 02:29:32.000000000 -0400
++++ evolution-data-server-1.12.3/camel/camel.c	2008-01-23 10:39:31.000000000 -0500
+@@ -53,22 +53,20 @@ camel_shutdown (void)
+ 	
+ 	if (!initialised)
+ 		return;
+-	
+-#if defined (HAVE_NSS) && !defined (G_OS_WIN32)
+-	/* For some reason we get into trouble on Win32 if we call these.
+-	 * But they shouldn't be necessary as the process is exiting anywy?
+-	 */
+-	NSS_Shutdown ();
+-	
+-	PR_Cleanup ();
+-#endif /* HAVE_NSS */
+-	
++
+ 	certdb = camel_certdb_get_default ();
+ 	if (certdb) {
+ 		camel_certdb_save (certdb);
+ 		camel_object_unref (certdb);
+ 	}
+-	
++
++        /* These next calls must come last. */
++
++#if defined (HAVE_NSS)
++        NSS_Shutdown ();
++        PR_Cleanup ();
++#endif /* HAVE_NSS */
++
+ 	initialised = FALSE;
+ }
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 06ba51e..afeae9d 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 1.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -62,6 +62,9 @@ Patch18: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch19: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# RH bug #278171 / GNOME bug #445309
+Patch20: evolution-data-server-1.12.3-camel-shutdown.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -150,6 +153,8 @@ evolution-data-server.
 %patch17 -p1 -b .code-cleanup
 %patch18 -p1 -b .camel-folder-summary-crash
 %patch19 -p1 -b .fix-64bit-acinclude
+%patch20 -p1 -b .camel-shutdown
+
 gtkdocize
 
 mkdir -p krb5-fakeprefix/include
@@ -383,6 +388,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Jan 23 2008 Matthew Barnes <mbarnes@redhat.com> - 1.12.3-2.fc8
+- Add patch for RH bug #278171 (crash on shutdown).
+
 * Mon Jan 07 2008 Milan Crha <mcrha@redhat.com> - 1.12.3-1.fc8
 - Update to 1.12.3
 - Run gtkdocize to avoid requiring gtk-doc 1.9, which is not available in F8