rpms/evolution/F-8 evolution.spec,1.300,1.301

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30029

Modified Files:
	evolution.spec 
Log Message:

* Thu Oct 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-3.fc8
- Disable patch for GNOME bug #376991 for now.  It may be contributing
  to password prompting problems as described in RH bug #296671.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- evolution.spec	16 Oct 2007 02:38:30 -0000	1.300
+++ evolution.spec	18 Oct 2007 18:05:35 -0000	1.301
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -114,7 +114,8 @@
 Patch31: evolution-2.9.3-meeting-list-view.patch
 
 # GNOME bug #376991
-Patch33: evolution-2.10.0-e-passwords.patch
+# XXX Disabled due to outstanding issues.
+#Patch33: evolution-2.10.0-e-passwords.patch
 
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
@@ -264,7 +265,7 @@
 #%patch29 -p1 -b .view-attachment-uri
 %patch30 -p1 -b .source-path-entry
 %patch31 -p1 -b .meeting-list-view
-%patch33 -p1 -b .e-passwords
+#%patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
 %patch35 -p1 -b .mail-attachment
 %patch36 -p1 -b .icon-names
@@ -718,6 +719,10 @@
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Thu Oct 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-3.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 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc8
 - Fix a broken zoom icon.