From 4f22dc85c94a8e583c3758ebab4bbc388c2d5d56 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jun 16 2008 17:41:49 +0000
Subject: - Update to 2.23.4


---

diff --git a/.cvsignore b/.cvsignore
index 82dd2b9..ada84bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.23.3.tar.bz2
+evolution-data-server-2.23.4.tar.bz2
diff --git a/evolution-data-server-1.8.0-fix-ldap-query.patch b/evolution-data-server-1.8.0-fix-ldap-query.patch
index bcece94..53e8934 100644
--- a/evolution-data-server-1.8.0-fix-ldap-query.patch
+++ b/evolution-data-server-1.8.0-fix-ldap-query.patch
@@ -1,7 +1,7 @@
-diff -up evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c
---- evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query	2007-11-29 07:53:49.000000000 -0500
-+++ evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-ldap.c	2007-12-03 16:12:33.000000000 -0500
-@@ -3339,22 +3339,28 @@ func_and(struct _ESExp *f, int argc, str
+diff -up evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c
+--- evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query	2008-06-15 23:18:08.000000000 -0400
++++ evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c	2008-06-16 10:34:29.000000000 -0400
+@@ -3417,22 +3417,28 @@ func_and(struct _ESExp *f, int argc, str
  	char ** strings;
  
  	if (argc > 0) {
@@ -32,7 +32,7 @@ diff -up evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-l
  
  		for (i = 0 ; i < argc + 2; i ++)
  			g_free (strings[i]);
-@@ -3376,22 +3382,28 @@ func_or(struct _ESExp *f, int argc, stru
+@@ -3454,22 +3460,28 @@ func_or(struct _ESExp *f, int argc, stru
  	char ** strings;
  
  	if (argc > 0) {
@@ -63,11 +63,11 @@ diff -up evolution-data-server-2.21.3/addressbook/backends/ldap/e-book-backend-l
  
  		for (i = 0 ; i < argc + 2; i ++)
  			g_free (strings[i]);
-@@ -3540,6 +3552,7 @@ func_beginswith(struct _ESExp *f, int ar
- 		char *ldap_attr = query_prop_to_ldap(propname);
- 
+@@ -3622,6 +3634,7 @@ func_beginswith(struct _ESExp *f, int ar
  		if (strlen (str) == 0) {
-+			ldap_data->list = g_list_prepend(ldap_data->list, g_strdup (""));
+ 			g_free (str);
+ 
++			ldap_data->list = g_list_prepend (ldap_data->list, g_strdup (""));
  			r = e_sexp_result_new (f, ESEXP_RES_BOOL);
  			r->value.bool = FALSE;
  			return r;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index aa1be54..ee4216f 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.23.3
+Version: 2.23.4
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -372,6 +372,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jun 16 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-1.fc10
+- Update to 2.23.4
+
 * Mon Jun 02 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.3-1.fc10
 - Update to 2.23.3
 - Remove patch for GNOME bug #531439 (fixed upstream).
diff --git a/sources b/sources
index 8c1b716..eded7de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c7f894f9e0bf82f691f420dad99ddb0  evolution-data-server-2.23.3.tar.bz2
+2b86e018c8483e5cc2077303ca8e57a7  evolution-data-server-2.23.4.tar.bz2