rpms/evolution/F-10 evolution-2.24.5-google-account-setup.patch, NONE, 1.1 evolution.spec, 1.368, 1.369

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1231

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.24.5-google-account-setup.patch 
Log Message:

* Mon Jun 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.5-2.fc10
- Add patch for RH bug #503445 (no username in Google calendar setup).


evolution-2.24.5-google-account-setup.patch:

--- NEW FILE evolution-2.24.5-google-account-setup.patch ---
diff -U0 evolution-2.24.5/plugins/google-account-setup/ChangeLog.google-account-setup evolution-2.24.5/plugins/google-account-setup/ChangeLog
diff -up evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c.google-account-setup evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c
--- evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c.google-account-setup	2009-02-25 06:55:23.000000000 -0500
+++ evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c	2009-06-01 08:38:03.000000000 -0400
@@ -300,7 +300,7 @@ plugin_google_contacts (EPlugin         
 
     g_object_set_data (G_OBJECT (epl), "gwidget", NULL);
 
-    if (strcmp (base_uri, "google://")) {
+    if (g_ascii_strncasecmp ("google://", base_uri, 9) != 0) {
         return NULL;
     }
 
diff -up evolution-2.24.5/plugins/google-account-setup/google-source.c.google-account-setup evolution-2.24.5/plugins/google-account-setup/google-source.c
--- evolution-2.24.5/plugins/google-account-setup/google-source.c.google-account-setup	2009-01-29 07:41:23.000000000 -0500
+++ evolution-2.24.5/plugins/google-account-setup/google-source.c	2009-06-01 08:38:03.000000000 -0400
@@ -574,8 +574,7 @@ plugin_google  (EPlugin                 
 	group = e_source_peek_group (source);
 
 	widget = NULL;
-	if (!g_str_has_prefix (e_source_group_peek_base_uri (group),
-			       "Google")) {
+	if (g_ascii_strncasecmp ("google://", e_source_group_peek_base_uri (group), 9) != 0) {
 		return NULL;
 	}
 


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/evolution.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- evolution.spec	25 Feb 2009 15:56:15 -0000	1.368
+++ evolution.spec	1 Jun 2009 13:00:51 -0000	1.369
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.24.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -80,6 +80,9 @@ Patch14: evolution-2.9.1-im-context-rese
 # Don't ship broken plugins as stable
 Patch15: evolution-2.23.4-experimental-plugins.patch
 
+# RH bug #503445 / GNOME bug #574248
+Patch16: evolution-2.24.5-google-account-setup.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -232,6 +235,7 @@ This package contains supplemental utili
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .im-context-reset
 %patch15 -p1 -b .experimental-plugins
+%patch16 -p1 -b .google-account-setup
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -696,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Jun 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.5-2.fc10
+- Add patch for RH bug #503445 (no username in Google calendar setup).
+
 * Wed Feb 25 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.5-1.fc10
 - Update to 2.24.5