From cbd31edfa6a9b641cd328ebd588ad501b8a180bb Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mar 07 2013 12:02:47 +0000
Subject: Add patch for Red Hat bug #895769 (signature migration)


---

diff --git a/evolution-data-server-3.6.4-signature-migration.patch b/evolution-data-server-3.6.4-signature-migration.patch
new file mode 100644
index 0000000..fd39ddc
--- /dev/null
+++ b/evolution-data-server-3.6.4-signature-migration.patch
@@ -0,0 +1,27 @@
+diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+index 2d695f6..6729af3 100644
+--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
++++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+@@ -2161,17 +2161,19 @@ migrate_parse_signature_xml_text (GMarkupParseContext *context,
+ 		parse_data->signature_file = NULL;
+ 
+ 		/* If the signature is a script, we symlink to it.
+-		 * Otherwise we move and rename the regular file. */
++		 * Otherwise we move and rename the regular file.
++		 * Also ignore errors here, otherwise it stops whole migration.
++		 */
+ 		if (parse_data->is_script)
+ 			g_file_make_symbolic_link (
+ 				new_signature_file,
+-				absolute_path, NULL, error);
++				absolute_path, NULL, NULL);
+ 		else
+ 			g_file_move (
+ 				old_signature_file,
+ 				new_signature_file,
+ 				G_FILE_COPY_NONE,
+-				NULL, NULL, NULL, error);
++				NULL, NULL, NULL, NULL);
+ 
+ 		g_object_unref (old_signature_file);
+ 		g_object_unref (new_signature_file);
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 5db810e..1dae39c 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 3.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -43,6 +43,9 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# RH bug #895769
+Patch02: evolution-data-server-3.6.4-signature-migration.patch
+
 ### Build Dependencies ###
 
 BuildRequires: bison
@@ -123,6 +126,7 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
+%patch02 -p1 -b .signature-migration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -367,6 +371,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Mar 07 2013 Milan Crha <mcrha@redhat.com> - 3.6.4-2
+- Add patch for Red Hat bug #895769 (signature migration)
+
 * Thu Mar 07 2013 Milan Crha <mcrha@redhat.com> - 3.6.4-1
 - Update to 3.6.4
 - Remove patch for Red Hat bug #901942 (fixed upstream)