[evolution-data-server/f14/master] Add test patch for Red Hat bug #629398

[Milan Crha]

commit 5aec8e57b1a13798d0b427fc7d3a701f228adf1b
Author: Milan Crha <mcrha at redhat.com>
Date:   Fri Oct 15 11:23:20 2010 +0200

    Add test patch for Red Hat bug #629398

 evolution-data-server-2.32.0-rh629398.patch |   30 +++++++++++++++++++++++++++
 evolution-data-server.spec                  |    8 ++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-2.32.0-rh629398.patch b/evolution-data-server-2.32.0-rh629398.patch
new file mode 100644
index 0000000..b0a3828
--- /dev/null
+++ b/evolution-data-server-2.32.0-rh629398.patch
@@ -0,0 +1,30 @@
+diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
+index ea3b68a..77fa771 100644
+--- a/addressbook/libebook/e-book.c
++++ b/addressbook/libebook/e-book.c
+@@ -3186,7 +3186,24 @@ check_uri (ESource *source, gpointer uri)
+ 
+ 	suri = e_source_peek_absolute_uri (source);
+ 
+-	return suri && g_ascii_strcasecmp (suri, uri) == 0;
++	if (suri && g_ascii_strcasecmp (suri, uri) == 0)
++		return TRUE;
++
++	if (!suri && e_source_peek_group (source)) {
++		gboolean res = FALSE;
++		gchar *my_uri = g_strconcat (
++			e_source_group_peek_base_uri (e_source_peek_group (source)),
++			e_source_peek_relative_uri (source),
++			NULL);
++
++		res = my_uri && g_ascii_strcasecmp (my_uri, uri) == 0;
++
++		g_free (my_uri);
++
++		return res;
++	}
++
++	return FALSE;
+ }
+ 
+ /**
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 0650e89..bb44f73 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 2.32.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -44,6 +44,8 @@ Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 # libebook accidentally got linked to GTK+
 Patch12: evolution-data-server-2.32.0-dont-link-libebook-to-gtk.patch
 
+Patch13: evolution-data-server-2.32.0-rh629398.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -122,6 +124,7 @@ This package contains developer documentation for %{name}.
 
 %patch11 -p1 -b .fix-64bit-acinclude
 %patch12 -p1 -b .dont-link-libebook-to-gtk
+%patch13 -p1 -b .rh629398
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -336,6 +339,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Oct 15 2010 Milan Crha <mcrha at redhat.com> - 2.32.0-3.fc14
+- Add test patch for Red Hat bug #629398
+
 * Fri Oct 01 2010 Matthew Barnes <mbarnes at redhat.com> - 2.32.0-2.fc14
 - Don't link libebook to GTK+.