Update to 2.31.90
This commit is contained in:
Matthew Barnes
parent
fbb4f8fcc9
commit
738b3cd7fe
5 changed files with 7 additions and 93 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
evolution-2.31.5.tar.bz2
|
||||
evolution-2.31.6.tar.bz2
|
||||
evolution-2.31.90.tar.bz2
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -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;
|
||||
|
|
@ -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 <mbarnes@redhat.com> - 2.31.90-1.fc14
|
||||
- Update to 2.31.90
|
||||
|
||||
* Fri Aug 06 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.6-2.fc14
|
||||
- Fix handling of migrated signature files.
|
||||
|
||||
|
|
|
|||
1
sources
1
sources
|
|
@ -1 +1,2 @@
|
|||
8522c7a972be2629924f985981911655 evolution-2.31.6.tar.bz2
|
||||
47529ba95ef77881f9aea6f9f98cf9fa evolution-2.31.90.tar.bz2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue