rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.29.4

Browse Source 
- Remove patch for GNOME bug #487988 (fixed upstream).
This commit is contained in:
Milan Crha 2009-12-21 17:39:57 +00:00
parent c406f78e0d
commit 2d15f7de31
4 changed files with 8 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-data-server-2.29.3.tar.bz2
evolution-data-server-2.29.4.tar.bz2

73
evolution-data-server-1.8.0-fix-ldap-query.patch
View File

@ -1,73 +0,0 @@
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, gint argc, str
gchar ** strings;
if (argc > 0) {
- gint i;
+ gint i, empty;
strings = g_new0(gchar *, argc+3);
strings[0] = g_strdup ("(&");
strings[argc+3 - 2] = g_strdup (")");
+ empty = 0;
for (i = 0; i < argc; i ++) {
GList *list_head = ldap_data->list;
if (!list_head)
break;
+ if (strlen (list_head->data) == 0)
+ empty++;
strings[argc - i] = list_head->data;
ldap_data->list = g_list_remove_link(list_head, list_head);
g_list_free_1(list_head);
}
- ldap_data->list = g_list_prepend(ldap_data->list, g_strjoinv(" ", strings));
+ if (empty == argc)
+ ldap_data->list = g_list_prepend(ldap_data->list, g_strdup(" "));
+ else
+ ldap_data->list = g_list_prepend(ldap_data->list, g_strjoinv(" ", strings));
for (i = 0; i < argc + 2; i ++)
g_free (strings[i]);
@@ -3454,22 +3460,28 @@ func_or(struct _ESExp *f, gint argc, stru
gchar ** strings;
if (argc > 0) {
- gint i;
+ gint i, empty;
strings = g_new0(gchar *, argc+3);
strings[0] = g_strdup ("(|");
strings[argc+3 - 2] = g_strdup (")");
+ empty = 0;
for (i = 0; i < argc; i ++) {
GList *list_head = ldap_data->list;
if (!list_head)
break;
+ if (strlen (list_head->data) == 0)
+ empty++;
strings[argc - i] = list_head->data;
ldap_data->list = g_list_remove_link(list_head, list_head);
g_list_free_1(list_head);
}
- ldap_data->list = g_list_prepend(ldap_data->list, g_strjoinv(" ", strings));
+ if (empty == argc)
+ ldap_data->list = g_list_prepend(ldap_data->list, g_strdup(" "));
+ else
+ ldap_data->list = g_list_prepend(ldap_data->list, g_strjoinv(" ", strings));
for (i = 0; i < argc + 2; i ++)
g_free (strings[i]);
@@ -3622,6 +3634,7 @@ func_beginswith(struct _ESExp *f, int ar
if (strlen (str) == 0) {
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;

12
evolution-data-server.spec
View File

@ -24,8 +24,8 @@
### Abstract ###
Name: evolution-data-server
Version: 2.29.3
Release: 3%{?dist}
Version: 2.29.4
Release: 1%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
@ -38,9 +38,6 @@ Obsoletes: evolution-webcal < 2.24.0
### Patches ###
# RH bug #215702 / GNOME bug #487988
Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch
# RH bug #243296
Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
@ -120,7 +117,6 @@ This package contains developer documentation for %{name}.
%prep
%setup -q
%patch10 -p1 -b .fix-ldap-query
%patch11 -p1 -b .fix-64bit-acinclude
mkdir -p krb5-fakeprefix/include
@ -338,6 +334,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
* Mon Dec 21 2009 Milan Crha <mcrha@redhat.com> - 2.29.4-1.fc13
- Update to 2.29.4
- Remove patch for GNOME bug #487988 (fixed upstream).
* Wed Dec 09 2009 Bastien Nocera <bnocera@redhat.com> 2.29.3-3
- Remove libgnome and libgnomeui requirements

2
sources
View File

@ -1 +1 @@
b2144ed554ddd1c626d2e5c120d91776 evolution-data-server-2.29.3.tar.bz2
6566bda27d293317729b1cee5f0ae507 evolution-data-server-2.29.4.tar.bz2