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

- Update to 2.21.1

Browse Source 
- Bump eds_base_version to 2.22.
- Remove patch for RH bug #212106 (fixed upstream).
- Remove patch for GNOME bug #417999 (fixed upstream).
This commit is contained in:
Matthew Barnes 2007-10-29 16:59:06 +00:00
parent 974bb037b7
commit a188ce3308
6 changed files with 100 additions and 1151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-data-server-1.12.1.tar.bz2
evolution-data-server-2.21.1.tar.bz2

1080
evolution-data-server-1.10.0-code-cleanup.patch
View File

File diff suppressed because it is too large Load Diff

56
evolution-data-server-1.8.0-db4.patch
View File

@ -1,56 +0,0 @@
diff -up evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c.db4 evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c
--- evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c.db4 2007-10-12 02:29:47.000000000 -0400
+++ evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c 2007-10-19 11:56:03.000000000 -0400
@@ -1137,23 +1137,30 @@ e_book_backend_file_load_source (EBookBa
return db_error_to_status (db_error);
}
+ db->close (db, 0);
+ db_error = db_create (&db, env, 0);
+ if (db_error != 0) {
+ g_warning ("db_create failed with %s", db_strerror (db_error));
+ g_free (dirname);
+ g_free (filename);
+ return db_error_to_status (db_error);
+ }
+
db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
}
- bf->priv->file_db = db;
-
if (db_error == 0) {
writable = TRUE;
} else {
db->close (db, 0);
-
db_error = db_create (&db, env, 0);
if (db_error != 0) {
g_warning ("db_create failed with %s", db_strerror (db_error));
g_free (dirname);
g_free (filename);
- return GNOME_Evolution_Addressbook_OtherError;
+ return db_error_to_status (db_error);
}
+
db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666);
if (db_error != 0 && !only_if_exists) {
@@ -1178,7 +1185,7 @@ e_book_backend_file_load_source (EBookBa
g_warning ("db_create failed with %s", db_strerror (db_error));
g_free (dirname);
g_free (filename);
- return GNOME_Evolution_Addressbook_OtherError;
+ return db_error_to_status (db_error);
}
db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
@@ -1201,6 +1208,8 @@ e_book_backend_file_load_source (EBookBa
}
}
+ bf->priv->file_db = db;
+
if (db_error != 0) {
bf->priv->file_db = NULL;
g_free (dirname);

77
evolution-data-server-2.21.1-implicit-function-declarations.patch Normal file
View File

@ -0,0 +1,77 @@
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 <libxml/xpath.h>
#include <libxml/xpathInternals.h>
+#include <string.h>
#include <gdata-entry.h>
#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;
}

34
evolution-data-server.spec
View File

@ -10,7 +10,7 @@
%define orbit2_version 2.9.8
%define soup_version 2.2.3
%define eds_base_version 1.12
%define eds_base_version 2.22
%define eds_api_version 1.2
%define use_gnome_keyring 1
@ -25,8 +25,8 @@
### Abstract ###
Name: evolution-data-server
Version: 1.12.1
Release: 4%{?dist}
Version: 2.21.1
Release: 1%{?dist}
License: LGPL
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@ -45,9 +45,6 @@ Patch11: evolution-data-server-1.8.0-no-gnome-common.patch
# RH bug #202309
Patch12: evolution-data-server-1.7.91-maybe-fix-crash.patch
# RH bug #212106
Patch13: evolution-data-server-1.8.0-db4.patch
# RH bug #215702 / GNOME bug #487988
Patch14: evolution-data-server-1.8.0-fix-ldap-query.patch
@ -58,15 +55,15 @@ Patch15: evolution-data-server-1.9.1-kill-ememory.patch
# XXX Disabled due to outstanding issues.
#Patch16: evolution-data-server-1.9.92-e-passwords.patch
# GNOME bug #417999
Patch17: evolution-data-server-1.10.0-code-cleanup.patch
# GNOME bug #373146
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
@ -142,13 +139,12 @@ This package contains developer documentation for %{name}.
%patch10 -p1 -b .ldaphack
%patch11 -p1 -b .no-gnome-common
%patch12 -p1 -b .maybe-fix-crash
%patch13 -p1 -b .db4
%patch14 -p1 -b .fix-ldap-query
%patch15 -p1 -b .kill-ememory
#%patch16 -p1 -b .e-passwords
%patch17 -p1 -b .code-cleanup
%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
@ -249,7 +245,6 @@ autoconf
# http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40
%configure \
%gtkdoc_flags \
--with-libdb=/usr \
--enable-file-locking=fcntl \
--enable-dot-locking=no \
@ -296,6 +291,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libedataserverui-%{eds_api_version}.so.*
%{_libdir}/libegroupwise-%{eds_api_version}.so.*
%{_libdir}/libexchange-storage-%{eds_api_version}.so.*
%{_libdir}/libgdata-%{eds_api_version}.so.*
%{_libdir}/libgdata-google-%{eds_api_version}.so.*
%{_libexecdir}/evolution-data-server-%{eds_base_version}
%{_libexecdir}/camel-index-control-%{eds_api_version}
@ -342,12 +339,13 @@ rm -rf $RPM_BUILD_ROOT
%{eds_extensions_dir}/libebookbackendgroupwise.so
%{eds_extensions_dir}/libebookbackendldap.so
%{eds_extensions_dir}/libebookbackendvcf.so
%{eds_extensions_dir}/libecalbackendcaldav.so
%{eds_extensions_dir}/libecalbackendcontacts.so
%{eds_extensions_dir}/libecalbackendfile.so
%{eds_extensions_dir}/libecalbackendgoogle.so
%{eds_extensions_dir}/libecalbackendgroupwise.so
%{eds_extensions_dir}/libecalbackendhttp.so
%{eds_extensions_dir}/libecalbackendweather.so
%{eds_extensions_dir}/libecalbackendcaldav.so
%files devel
%defattr(-,root,root,-)
@ -362,6 +360,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libedataserverui-%{eds_api_version}.so
%{_libdir}/libegroupwise-%{eds_api_version}.so
%{_libdir}/libexchange-storage-%{eds_api_version}.so
%{_libdir}/libgdata-%{eds_api_version}.so
%{_libdir}/libgdata-google-%{eds_api_version}.so
%{_libdir}/pkgconfig/camel-%{eds_api_version}.pc
%{_libdir}/pkgconfig/camel-provider-%{eds_api_version}.pc
%{_libdir}/pkgconfig/evolution-data-server-%{eds_api_version}.pc
@ -373,6 +373,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libedataserverui-%{eds_api_version}.pc
%{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%{_libdir}/pkgconfig/libgdata-%{eds_api_version}.pc
%{_libdir}/pkgconfig/libgdata-google-%{eds_api_version}.pc
%files doc
%defattr(-,root,root,-)
@ -385,6 +387,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
* Mon Oct 29 2007 Matthew Barnes <mbarnes@redhat.com> - 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).
- Remove patch for GNOME bug #417999 (fixed upstream).
* Fri Oct 26 2007 Matthew Barnes <mbarnes@redhat.com> - 1.12.1-4.fc9
- Remove the use_gtk_doc macro.
- Remove redundant requirements.

2
sources
View File

@ -1 +1 @@
5b4d855ed1ceaaab7db14b50133b5252 evolution-data-server-1.12.1.tar.bz2
c9d5c8c3ab8edf8184828c732f498d06 evolution-data-server-2.21.1.tar.bz2