From 9040ef714e8d7319c2f207d3280f8b17bd46a87f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Nov 2007 19:41:51 +0000 Subject: [PATCH] - Update to 2.21.2 --- .cvsignore | 2 +- ....21.1-implicit-function-declarations.patch | 77 ------------------- evolution-data-server.spec | 11 ++- sources | 2 +- 4 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 evolution-data-server-2.21.1-implicit-function-declarations.patch diff --git a/.cvsignore b/.cvsignore index c0d3eef..7ee45ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-2.21.1.tar.bz2 +evolution-data-server-2.21.2.tar.bz2 diff --git a/evolution-data-server-2.21.1-implicit-function-declarations.patch b/evolution-data-server-2.21.1-implicit-function-declarations.patch deleted file mode 100644 index 260ad95..0000000 --- a/evolution-data-server-2.21.1-implicit-function-declarations.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -up evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c.implicit-function-declarations evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c ---- evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c.implicit-function-declarations 2007-10-24 02:39:44.000000000 -0400 -+++ evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c 2007-10-29 11:14:13.000000000 -0400 -@@ -31,6 +31,7 @@ - #include - #include - -+#include - #include - - #define GDATA_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_ENTRY, GDataEntryPrivate)) -@@ -812,7 +813,7 @@ build_hash_table_entries (gchar *key, gc - - if (ptr->next == NULL) { - /* FIXME: Will we be needing , these nodes of entries when building them ? */ -- if (!g_strcasecmp (key, "published") || !g_strcasecmp (key, "id") || !g_strcasecmp (key, "updated")) -+ if (!g_ascii_strcasecmp (key, "published") || !g_ascii_strcasecmp (key, "id") || !g_ascii_strcasecmp (key, "updated")) - break; - - ptr->next = xmlNewNode (NULL, (xmlChar *)key); -@@ -1081,7 +1082,7 @@ gdata_entry_get_edit_link (GDataEntry *e - - while (list) { - link = list->data; -- if (!g_strcasecmp (link->rel, "edit")) { -+ if (!g_ascii_strcasecmp (link->rel, "edit")) { - edit_link = g_strdup(link->href); - } - list = g_slist_next (list); -diff -up evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c.implicit-function-declarations evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c ---- evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c.implicit-function-declarations 2007-10-29 11:17:57.000000000 -0400 -+++ evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c 2007-10-29 11:18:19.000000000 -0400 -@@ -183,7 +183,7 @@ gdata_google_service_get_feed (GDataServ - - if (!service_is_authenticated( GDATA_GOOGLE_SERVICE(service) )) { - status = service_authenticate(GDATA_GOOGLE_SERVICE(service)); -- if (g_strcasecmp(status, "SUCCESS")) { -+ if (g_ascii_strcasecmp(status, "SUCCESS")) { - return NULL; - } - } -@@ -235,7 +235,7 @@ gdata_google_service_insert_entry (GData - if (!service_is_authenticated(GDATA_GOOGLE_SERVICE(service))) { - status = service_authenticate(GDATA_GOOGLE_SERVICE(service)); - -- if (g_strcasecmp(status,"SUCCESS")) -+ if (g_ascii_strcasecmp(status,"SUCCESS")) - return NULL; - } - -@@ -305,7 +305,7 @@ gdata_google_service_delete_entry (GData - - if (!service_is_authenticated (GDATA_GOOGLE_SERVICE(service))) { - status = (xmlChar *)service_authenticate (GDATA_GOOGLE_SERVICE(service)); -- if (g_strcasecmp((gchar *)status, "SUCCESS")) -+ if (g_ascii_strcasecmp((gchar *)status, "SUCCESS")) - return ; - } - -@@ -350,7 +350,7 @@ gdata_google_service_update_entry (GData - - if (!service_is_authenticated (GDATA_GOOGLE_SERVICE (service))) { - status = service_authenticate (GDATA_GOOGLE_SERVICE (service)); -- if (g_strcasecmp (status, "SUCCESS")) -+ if (g_ascii_strcasecmp (status, "SUCCESS")) - return; - } - -@@ -410,7 +410,7 @@ gdata_google_service_update_entry_with_l - - if (!service_is_authenticated (GDATA_GOOGLE_SERVICE(service))) { - status = service_authenticate (GDATA_GOOGLE_SERVICE(service)); -- if (g_strcasecmp (status, "SUCCESS")) -+ if (g_ascii_strcasecmp (status, "SUCCESS")) - return; - } - diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 29a518b..22e1d96 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -25,7 +25,7 @@ ### Abstract ### Name: evolution-data-server -Version: 2.21.1 +Version: 2.21.2 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -61,9 +61,6 @@ Patch18: 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 -# Implicit function declarations. -Patch20: evolution-data-server-2.21.1-implicit-function-declarations.patch - ### Build Dependencies ### BuildRequires: GConf2-devel @@ -144,7 +141,6 @@ This package contains developer documentation for %{name}. #%patch16 -p1 -b .e-passwords %patch18 -p1 -b .camel-folder-summary-crash %patch19 -p1 -b .fix-64bit-acinclude -%patch20 -p1 -b .implicit-function-declarations mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -387,7 +383,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog -* Mon Oct 29 2007 Matthew Barnes - 2.21.1.1-fc9 +* Mon Nov 12 2007 Matthew Barnes - 2.21.2-1.fc9 +- Update to 2.21.2 + +* Mon Oct 29 2007 Matthew Barnes - 2.21.1-1.fc9 - Update to 2.21.1 - Bump eds_base_version to 2.22. - Remove patch for RH bug #212106 (fixed upstream). diff --git a/sources b/sources index ce4c515..05df8ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9d5c8c3ab8edf8184828c732f498d06 evolution-data-server-2.21.1.tar.bz2 +48b902384ff830d522b3e3716a96bdb9 evolution-data-server-2.21.2.tar.bz2