From 738b3cd7feea40a49a298b3bc00a7303f9ae1d2c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Aug 2010 18:16:10 -0400 Subject: [PATCH] Update to 2.31.90 --- .gitignore | 1 + evolution-2.31.6-no-dbus-glib.patch | 33 -------------- evolution-2.31.6-signature-migration.patch | 50 ---------------------- evolution.spec | 15 +++---- sources | 1 + 5 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 evolution-2.31.6-no-dbus-glib.patch delete mode 100644 evolution-2.31.6-signature-migration.patch diff --git a/.gitignore b/.gitignore index 81c6130..203381b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ evolution-2.31.5.tar.bz2 evolution-2.31.6.tar.bz2 +evolution-2.31.90.tar.bz2 diff --git a/evolution-2.31.6-no-dbus-glib.patch b/evolution-2.31.6-no-dbus-glib.patch deleted file mode 100644 index b6f27ca..0000000 --- a/evolution-2.31.6-no-dbus-glib.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c.no-dbus-glib evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c ---- evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c.no-dbus-glib 2010-08-06 14:48:18.324805041 -0400 -+++ evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c 2010-08-06 14:48:49.018582948 -0400 -@@ -57,7 +57,6 @@ main (gint argc, gchar **argv) - textdomain (GETTEXT_PACKAGE); - - g_thread_init (NULL); -- dbus_g_thread_init (); - - #ifdef G_OS_WIN32 - path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); -diff -up evolution-2.31.6/capplet/anjal-settings-main.c.no-dbus-glib evolution-2.31.6/capplet/anjal-settings-main.c ---- evolution-2.31.6/capplet/anjal-settings-main.c.no-dbus-glib 2010-08-06 14:48:25.502555241 -0400 -+++ evolution-2.31.6/capplet/anjal-settings-main.c 2010-08-06 14:48:54.586593625 -0400 -@@ -225,7 +225,6 @@ main (gint argc, gchar *argv[]) - - if (!g_thread_get_initialized ()) - g_thread_init (NULL); -- dbus_g_thread_init (); - - client = gconf_client_get_default(); - -diff -up evolution-2.31.6/shell/main.c.no-dbus-glib evolution-2.31.6/shell/main.c ---- evolution-2.31.6/shell/main.c.no-dbus-glib 2010-08-06 14:48:34.018804548 -0400 -+++ evolution-2.31.6/shell/main.c 2010-08-06 14:48:59.620635199 -0400 -@@ -492,7 +492,6 @@ main (gint argc, gchar **argv) - g_type_init (); - if (!g_thread_get_initialized ()) - g_thread_init (NULL); -- dbus_g_thread_init (); - - #ifdef G_OS_WIN32 - path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); diff --git a/evolution-2.31.6-signature-migration.patch b/evolution-2.31.6-signature-migration.patch deleted file mode 100644 index de5f456..0000000 --- a/evolution-2.31.6-signature-migration.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up evolution-2.31.6/e-util/e-signature.c.signature-migration evolution-2.31.6/e-util/e-signature.c ---- evolution-2.31.6/e-util/e-signature.c.signature-migration 2010-08-02 18:50:02.000000000 -0400 -+++ evolution-2.31.6/e-util/e-signature.c 2010-08-06 16:30:18.702805091 -0400 -@@ -493,28 +493,27 @@ e_signature_set_from_xml (ESignature *si - } - break; - } -- -- /* If the signature is not a script, replace the directory -- * part with the current signatures directory. This makes -- * moving the signatures directory transparent. */ -- if (!e_signature_get_is_script (signature)) { -- const gchar *user_data_dir; -- gchar *basename; -- gchar *filename; -- -- user_data_dir = e_get_user_data_dir (); -- -- filename = signature->priv->filename; -- basename = g_path_get_basename (filename); -- signature->priv->filename = g_build_filename ( -- user_data_dir, "signatures", basename, NULL); -- g_free (basename); -- g_free (filename); -- } -- - cur = cur->next; - } - -+ /* If the signature is not a script, replace the directory -+ * part with the current signatures directory. This makes -+ * moving the signatures directory transparent. */ -+ if (!e_signature_get_is_script (signature)) { -+ const gchar *user_data_dir; -+ gchar *basename; -+ gchar *filename; -+ -+ user_data_dir = e_get_user_data_dir (); -+ -+ filename = signature->priv->filename; -+ basename = g_path_get_basename (filename); -+ signature->priv->filename = g_build_filename ( -+ user_data_dir, "signatures", basename, NULL); -+ g_free (basename); -+ g_free (filename); -+ } -+ - xmlFreeDoc (doc); - - return changed; diff --git a/evolution.spec b/evolution.spec index db54cac..8ecc07e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -32,8 +32,8 @@ ### Abstract ### Name: evolution -Version: 2.31.6 -Release: 2%{?dist} +Version: 2.31.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -55,12 +55,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -# Remove leftover dbus-glib calls. -Patch14: evolution-2.31.6-no-dbus-glib.patch - -# Fix handling of migrated signature files. -Patch15: evolution-2.31.6-signature-migration.patch - ## Dependencies ### Requires(pre): GConf2 @@ -213,8 +207,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents -%patch14 -p1 -b .no-dbus-glib -%patch15 -p1 -b .signature-migration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -622,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 16 2010 Matthew Barnes - 2.31.90-1.fc14 +- Update to 2.31.90 + * Fri Aug 06 2010 Matthew Barnes - 2.31.6-2.fc14 - Fix handling of migrated signature files. diff --git a/sources b/sources index c46e87b..c11109e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8522c7a972be2629924f985981911655 evolution-2.31.6.tar.bz2 +47529ba95ef77881f9aea6f9f98cf9fa evolution-2.31.90.tar.bz2