rpms/evolution-data-server/devel evolution-data-server-2.21.5-password-dialog.patch, NONE, 1.1 evolution-data-server.spec, 1.198, 1.199 evolution-data-server-1.9.1-kill-ememory.patch, 1.3, NONE evolution-data-server-1.9.92-e-passwords.patch, 1.9, NONE evolution-data-server-2.21.2-base64.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20240

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.21.5-password-dialog.patch 
Removed Files:
	evolution-data-server-1.9.1-kill-ememory.patch 
	evolution-data-server-1.9.92-e-passwords.patch 
	evolution-data-server-2.21.2-base64.patch 
Log Message:

* Wed Jan 16 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-2.fc9
- Add patch for GNOME bug #509644 (password dialog breakage).
- Remove patch for RH bug #384741 (fixed upstream).
- Remove patch for GNOME bug #363695 (obsolete).
- Remove patch for GNOME bug #376991 (obsolete).


evolution-data-server-2.21.5-password-dialog.patch:

--- NEW FILE evolution-data-server-2.21.5-password-dialog.patch ---
diff -up evolution-data-server-2.21.5/libedataserverui/e-passwords.c.password-dialog evolution-data-server-2.21.5/libedataserverui/e-passwords.c
--- evolution-data-server-2.21.5/libedataserverui/e-passwords.c.password-dialog	2008-01-16 12:23:51.000000000 -0500
+++ evolution-data-server-2.21.5/libedataserverui/e-passwords.c	2008-01-16 12:24:18.000000000 -0500
@@ -873,12 +873,12 @@ ep_ask_password (EPassMsg *msg)
 
 	widget = gtk_dialog_new_with_buttons (
 		msg->title, msg->parent, 0,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
 		NULL);
 	gtk_dialog_set_has_separator (GTK_DIALOG (widget), FALSE);
 	gtk_dialog_set_default_response (
-		GTK_DIALOG (widget), GTK_RESPONSE_ACCEPT);
+		GTK_DIALOG (widget), GTK_RESPONSE_OK);
         gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 	password_dialog = GTK_DIALOG (widget);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- evolution-data-server.spec	14 Jan 2008 20:16:10 -0000	1.198
+++ evolution-data-server.spec	16 Jan 2008 18:35:23 -0000	1.199
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 2.21.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -47,23 +47,16 @@
 Patch12: evolution-data-server-1.7.91-maybe-fix-crash.patch
 
 # RH bug #215702 / GNOME bug #487988
-Patch14: evolution-data-server-1.8.0-fix-ldap-query.patch
-
-# GNOME bug #363695
-Patch15: evolution-data-server-1.9.1-kill-ememory.patch
-
-# GNOME bug #376991
-# XXX Disabled due to outstanding issues.
-#Patch16: evolution-data-server-1.9.92-e-passwords.patch
+Patch13: evolution-data-server-1.8.0-fix-ldap-query.patch
 
 # GNOME bug #373146
-Patch18: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
+Patch14: 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
+Patch15: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# RH bug #384741 / GNOME bug #474000
-Patch20: evolution-data-server-2.21.2-base64.patch
+# GNOME bug #509644
+Patch16: evolution-data-server-2.21.5-password-dialog.patch
 
 ### Build Dependencies ###
 
@@ -140,12 +133,10 @@
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .no-gnome-common
 %patch12 -p1 -b .maybe-fix-crash
-%patch14 -p1 -b .fix-ldap-query
-#%patch15 -p1 -b .kill-ememory
-##%patch16 -p1 -b .e-passwords
-#%patch18 -p1 -b .camel-folder-summary-crash
-#%patch19 -p1 -b .fix-64bit-acinclude
-#%patch20 -p1 -b .base64
+%patch13 -p1 -b .fix-ldap-query
+%patch14 -p1 -b .camel-folder-summary-crash
+%patch15 -p1 -b .fix-64bit-acinclude
+%patch16 -p1 -b .password-dialog
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -388,6 +379,12 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed Jan 16 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-2.fc9
+- Add patch for GNOME bug #509644 (password dialog breakage).
+- Remove patch for RH bug #384741 (fixed upstream).
+- Remove patch for GNOME bug #363695 (obsolete).
+- Remove patch for GNOME bug #376991 (obsolete).
+
 * Mon Jan 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-1.fc9
 - Update to 2.21.5
 


--- evolution-data-server-1.9.1-kill-ememory.patch DELETED ---


--- evolution-data-server-1.9.92-e-passwords.patch DELETED ---


--- evolution-data-server-2.21.2-base64.patch DELETED ---