From 632ead38c1a09a041a447839b9901f1397f8f2af Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Oct 16 2007 20:07:41 +0000
Subject: - Disable patch for GNOME bug #376991 for now. It may be contributing to

    password prompting problems as described in RH bug #296671.

---

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 581ad14..1d1e159 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 1.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,7 +50,8 @@ Patch12: evolution-data-server-1.7.91-maybe-fix-crash.patch
 Patch14: evolution-data-server-1.9.1-kill-ememory.patch
 
 # GNOME bug #376991
-Patch16: evolution-data-server-1.9.92-e-passwords.patch
+# XXX Disabled due to outstanding issues.
+#Patch16: evolution-data-server-1.9.92-e-passwords.patch
 
 # GNOME bug #417999
 Patch18: evolution-data-server-1.10.0-code-cleanup.patch
@@ -145,7 +146,7 @@ evolution-data-server.
 %patch11 -p1 -b .no-gnome-common
 %patch12 -p1 -b .maybe-fix-crash
 %patch14 -p1 -b .kill-ememory
-%patch16 -p1 -b .e-passwords
+#%patch16 -p1 -b .e-passwords
 %patch18 -p1 -b .code-cleanup
 %patch19 -p1 -b .camel-folder-symmary-crash
 %patch20 -p1 -b .fix-64bit-acinclude
@@ -381,6 +382,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Oct 16 2007 Matthew Barnes <mbarnes@redhat.com> - 1.12.1-2.fc8
+- Disable patch for GNOME bug #376991 for now.  It may be contributing
+  to password prompting problems as described in RH bug #296671.
+
 * Mon Oct 15 2007 Milan Crha <mcrha@redhat.com> - 1.12.1-1.fc8
 - Update to 1.12.1