From 3bd4a1a8f54858dfc2cfe5a065c8281c7a9a1bba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Jun 02 2008 12:47:59 +0000 Subject: - Update to 2.23.3 - Remove patch for GNOME bug #531439 (fixed upstream). --- diff --git a/.cvsignore b/.cvsignore index 49abe6f..82dd2b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-2.23.2.tar.bz2 +evolution-data-server-2.23.3.tar.bz2 diff --git a/evolution-data-server-2.23.2-gpg-passphrases.patch b/evolution-data-server-2.23.2-gpg-passphrases.patch deleted file mode 100644 index 040db90..0000000 --- a/evolution-data-server-2.23.2-gpg-passphrases.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up evolution-data-server-2.23.2/libedataserverui/e-passwords.c.gpg-passphrases evolution-data-server-2.23.2/libedataserverui/e-passwords.c ---- evolution-data-server-2.23.2/libedataserverui/e-passwords.c.gpg-passphrases 2008-05-12 01:33:57.000000000 -0400 -+++ evolution-data-server-2.23.2/libedataserverui/e-passwords.c 2008-05-18 23:40:19.000000000 -0400 -@@ -193,19 +193,29 @@ ep_keyring_error_domain (void) - } - - static EUri * --ep_keyring_uri_new (const gchar *string) -+ep_keyring_uri_new (const gchar *string, -+ GError **error) - { - EUri *uri; - - uri = e_uri_new (string); -- if (uri == NULL) -- return NULL; -+ g_return_val_if_fail (uri != NULL, NULL); - - /* LDAP URIs do not have usernames, so use the URI as the username. */ - if (uri->user == NULL && uri->protocol != NULL && - (strcmp (uri->protocol, "ldap") == 0|| strcmp (uri->protocol, "google") == 0)) - uri->user = g_strdelimit (g_strdup (string), "/=", '_'); - -+ /* Make sure the URI has the required components. */ -+ if (uri->user == NULL && uri->host == NULL) { -+ g_set_error ( -+ error, EP_KEYRING_ERROR, -+ GNOME_KEYRING_RESULT_BAD_ARGUMENTS, -+ _("Keyring key is unusable: no user or host name")); -+ e_uri_free (uri); -+ uri = NULL; -+ } -+ - return uri; - } - -@@ -618,8 +628,9 @@ ep_remember_password_keyring (EPassMsg * - return; - } - -- uri = ep_keyring_uri_new (msg->key); -- g_return_if_fail (uri != NULL); -+ uri = ep_keyring_uri_new (msg->key, &msg->error); -+ if (uri == NULL) -+ return; - - /* Only remove the password from the session hash - * if the keyring insertion was successful. */ -@@ -681,8 +692,9 @@ ep_forget_password_keyring (EPassMsg *ms - EUri *uri; - GError *error = NULL; - -- uri = ep_keyring_uri_new (msg->key); -- g_return_if_fail (uri != NULL); -+ uri = ep_keyring_uri_new (msg->key, &msg->error); -+ if (uri == NULL) -+ return; - - /* Find all Evolution passwords matching the URI and delete them. */ - passwords = ep_keyring_lookup_passwords (uri->user, uri->host, &error); -@@ -754,8 +766,9 @@ ep_get_password_keyring (EPassMsg *msg) - EUri *uri; - GError *error = NULL; - -- uri = ep_keyring_uri_new (msg->key); -- g_return_if_fail (uri != NULL); -+ uri = ep_keyring_uri_new (msg->key, &msg->error); -+ if (uri == NULL) -+ return; - - /* Find the first Evolution password that matches the URI. */ - passwords = ep_keyring_lookup_passwords (uri->user, uri->host, &error); diff --git a/evolution-data-server-2.23.2-libebackend-breakage.patch b/evolution-data-server-2.23.2-libebackend-breakage.patch deleted file mode 100644 index f2a2cac..0000000 --- a/evolution-data-server-2.23.2-libebackend-breakage.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in.libebackend-breakage evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in ---- evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in.libebackend-breakage 2008-04-11 07:10:27.000000000 -0400 -+++ evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in 2008-05-13 12:52:00.000000000 -0400 -@@ -13,6 +13,6 @@ privincludedir=@privincludedir@ - Name: libedatabook - Description: Backend library for evolution address books - Version: @VERSION@ --Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebook-1.2 -+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebackend-1.2 libebook-1.2 - Libs: -L${libdir} -ledata-book-1.2 - Cflags: -I${privincludedir} -diff -up evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in.libebackend-breakage evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in ---- evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in.libebackend-breakage 2008-04-18 01:48:20.000000000 -0400 -+++ evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in 2008-05-13 12:52:00.000000000 -0400 -@@ -13,6 +13,6 @@ privincludedir=@privincludedir@ - Name: libedata-cal - Description: Backend library for evolution calendars - Version: @VERSION@ --Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 libecal-1.2 gio-2.0 -+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 libebackend-1.2 libecal-1.2 gio-2.0 - Libs: -L${libdir} -ledata-cal-1.2 -lecal-1.2 - Cflags: -I${privincludedir} -diff -up evolution-data-server-2.23.2/libebackend/libebackend.pc.in.libebackend-breakage evolution-data-server-2.23.2/libebackend/libebackend.pc.in ---- evolution-data-server-2.23.2/libebackend/libebackend.pc.in.libebackend-breakage 2008-05-12 01:33:56.000000000 -0400 -+++ evolution-data-server-2.23.2/libebackend/libebackend.pc.in 2008-05-13 12:51:59.000000000 -0400 -@@ -11,5 +11,5 @@ Name: libebackend - Description: Utility library for Evolution Data Server Backends - Version: @VERSION@ - Requires: glib-2.0 --Libs: -L${libdir} -lbackend-@API_VERSION@ -+Libs: -L${libdir} -lebackend-@API_VERSION@ - Cflags: -I${privincludedir} diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 141739c..aa1be54 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution-data-server -Version: 2.23.2 -Release: 3%{?dist} +Version: 2.23.3 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -50,12 +50,6 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch # RH bug #243296 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -# Fix some typos and oversights related to libebackend -Patch14: evolution-data-server-2.23.2-libebackend-breakage.patch - -# GNOME bug #531439 -Patch15: evolution-data-server-2.23.2-gpg-passphrases.patch - ### Build Dependencies ### BuildRequires: GConf2-devel @@ -132,8 +126,6 @@ This package contains developer documentation for %{name}. %patch11 -p1 -b .fix-ldap-query %patch12 -p1 -b .camel-folder-summary-crash %patch13 -p1 -b .fix-64bit-acinclude -%patch14 -p1 -b .libebackend-breakage -%patch15 -p1 -b .gpg-passphrases mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -380,6 +372,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon Jun 02 2008 Matthew Barnes - 3.23.3-1.fc10 +- Update to 2.23.3 +- Remove patch for GNOME bug #531439 (fixed upstream). + * Sun May 18 2008 Matthew Barnes - 2.23.2-3.fc10 - Add patch for GNOME bug #531439 (GPG passphrases destroy passwords). diff --git a/sources b/sources index fa49a0e..8c1b716 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa4aa533431b60afcf3982f8f5bacfcb evolution-data-server-2.23.2.tar.bz2 +4c7f894f9e0bf82f691f420dad99ddb0 evolution-data-server-2.23.3.tar.bz2