From 48e4e7d8be902a044991281ba07d9be3a76214f3 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jun 14 2007 19:22:32 +0000
Subject: - Add patch for GNOME bug #312584 (renaming Exchange folders).


---

diff --git a/evolution-data-server-1.11.3-exchange-hierarchy-webdav.patch b/evolution-data-server-1.11.3-exchange-hierarchy-webdav.patch
new file mode 100644
index 0000000..5f437ee
--- /dev/null
+++ b/evolution-data-server-1.11.3-exchange-hierarchy-webdav.patch
@@ -0,0 +1,11 @@
+--- evolution-data-server-1.11.3/servers/exchange/storage/exchange-hierarchy-webdav.c.exchange-hierarchy-webdav	2007-04-18 06:10:13.000000000 -0400
++++ evolution-data-server-1.11.3/servers/exchange/storage/exchange-hierarchy-webdav.c	2007-06-14 14:49:33.000000000 -0400
+@@ -419,7 +419,7 @@ xfer_folder (ExchangeHierarchy *hier, EF
+ 			exchange_hierarchy_removed_folder (hier, source);
+ 		exchange_hierarchy_new_folder (hier, dest);
+ 		scan_subtree (hier, dest, mode);
+-		physical_uri = (char *) e_folder_get_physical_uri (source);
++		physical_uri = g_strdup (e_folder_get_physical_uri (source));
+ 		g_object_unref (dest);
+ 		ret_code = EXCHANGE_ACCOUNT_FOLDER_OK;
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index dee46d8..1cb4b49 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.11.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -66,6 +66,9 @@ Patch19: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #215634
 Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
 
+# GNOME bug #312584
+Patch21: evolution-data-server-1.11.3-exchange-hierarchy-webdav.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -155,6 +158,7 @@ evolution-data-server.
 %patch18 -p1 -b .code-cleanup
 %patch19 -p1 -b .camel-folder-symmary-crash
 %patch20 -p1 -b .camel-certdb-nss-cert-get
+%patch21 -p1 -b .exchange-hierarchy-webdav
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -379,6 +383,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Thu Jun 14 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.3-2.fc8
+- Add patch for GNOME bug #312584 (renaming Exchange folders).
+
 * Mon Jun 04 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.3-1.fc8
 - Update to 1.11.3
 - Remove patch for GNOME bug #415922 (fixed upstream).