From 9ec66593941726f00d5011a21a1cb69f3edaa031 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Sep 2014 09:19:12 +0200 Subject: [PATCH] Update to 3.13.6 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 59 +++++++------ evolution.spec | 121 ++++++++++++++------------- sources | 2 +- 4 files changed, 92 insertions(+), 91 deletions(-) diff --git a/.gitignore b/.gitignore index 08b92b7..680e1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.12.4.tar.xz /evolution-3.13.4.tar.xz /evolution-3.13.5.tar.xz +/evolution-3.13.6.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index ba5c29b..0b9e3be 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 -+++ evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c 2014-04-14 11:15:36.606320997 +0200 -@@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e +diff -up evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-09-22 09:15:05.051468361 +0200 ++++ evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c 2014-09-22 09:17:01.509463747 +0200 +@@ -4143,6 +4143,10 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); @@ -9,13 +9,12 @@ diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help + gtk_widget_set_sensitive (widget, FALSE); + gtk_widget_hide (widget); + } -+ + widget = e_builder_get_widget ( - e_contact_editor->priv->builder, "button-web-expand"); - g_signal_connect_swapped ( -diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.12.1/calendar/gui/dialogs/comp-editor.c ---- evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 -+++ evolution-3.12.1/calendar/gui/dialogs/comp-editor.c 2014-04-14 11:15:36.606320997 +0200 + e_contact_editor->priv->builder, "expander-contact-phone"); +diff -up evolution-3.13.6/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.13.6/calendar/gui/dialogs/comp-editor.c +--- evolution-3.13.6/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-11 09:21:59.000000000 +0200 ++++ evolution-3.13.6/calendar/gui/dialogs/comp-editor.c 2014-09-22 09:15:05.052468361 +0200 @@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,10 +28,10 @@ diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolu action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e-util/e-misc-utils.c ---- evolution-3.12.1/e-util/e-misc-utils.c.help-contents 2014-04-14 11:15:36.606320997 +0200 -+++ evolution-3.12.1/e-util/e-misc-utils.c 2014-04-14 11:15:47.698320550 +0200 -@@ -2103,6 +2103,23 @@ e_binding_transform_uid_to_source (GBind +diff -up evolution-3.13.6/e-util/e-misc-utils.c.help-contents evolution-3.13.6/e-util/e-misc-utils.c +--- evolution-3.13.6/e-util/e-misc-utils.c.help-contents 2014-07-11 08:47:35.000000000 +0200 ++++ evolution-3.13.6/e-util/e-misc-utils.c 2014-09-22 09:15:05.052468361 +0200 +@@ -2493,6 +2493,23 @@ e_binding_transform_uid_to_source (GBind return success; } @@ -56,10 +55,10 @@ diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e /** * e_binding_transform_text_non_null: * @binding: a #GBinding -diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e-util/e-misc-utils.h ---- evolution-3.12.1/e-util/e-misc-utils.h.help-contents 2014-04-14 11:15:36.607320997 +0200 -+++ evolution-3.12.1/e-util/e-misc-utils.h 2014-04-14 11:16:06.930319775 +0200 -@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour +diff -up evolution-3.13.6/e-util/e-misc-utils.h.help-contents evolution-3.13.6/e-util/e-misc-utils.h +--- evolution-3.13.6/e-util/e-misc-utils.h.help-contents 2014-07-07 12:45:01.000000000 +0200 ++++ evolution-3.13.6/e-util/e-misc-utils.h 2014-09-22 09:15:05.052468361 +0200 +@@ -229,6 +229,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -68,9 +67,9 @@ diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e gboolean e_binding_transform_text_non_null (GBinding *binding, const GValue *source_value, -diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution-3.12.1/e-util/e-preferences-window.c ---- evolution-3.12.1/e-util/e-preferences-window.c.help-contents 2014-03-23 02:13:17.000000000 +0100 -+++ evolution-3.12.1/e-util/e-preferences-window.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/e-util/e-preferences-window.c.help-contents evolution-3.13.6/e-util/e-preferences-window.c +--- evolution-3.13.6/e-util/e-preferences-window.c.help-contents 2014-02-12 20:47:07.000000000 +0100 ++++ evolution-3.13.6/e-util/e-preferences-window.c 2014-09-22 09:15:05.053468361 +0200 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -83,9 +82,9 @@ diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution- widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1/e-util/e-send-options.c ---- evolution-3.12.1/e-util/e-send-options.c.help-contents 2014-04-13 16:33:29.000000000 +0200 -+++ evolution-3.12.1/e-util/e-send-options.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/e-util/e-send-options.c.help-contents evolution-3.13.6/e-util/e-send-options.c +--- evolution-3.13.6/e-util/e-send-options.c.help-contents 2014-03-27 15:05:39.000000000 +0100 ++++ evolution-3.13.6/e-util/e-send-options.c 2014-09-22 09:15:05.053468361 +0200 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -107,9 +106,9 @@ diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1 return (priv->priority && priv->security && priv->status -diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.12.1/plugins/email-custom-header/email-custom-header.c ---- evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-23 02:13:18.000000000 +0100 -+++ evolution-3.12.1/plugins/email-custom-header/email-custom-header.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.13.6/plugins/email-custom-header/email-custom-header.c +--- evolution-3.13.6/plugins/email-custom-header/email-custom-header.c.help-contents 2014-06-09 16:39:38.000000000 +0200 ++++ evolution-3.13.6/plugins/email-custom-header/email-custom-header.c 2014-09-22 09:15:05.053468361 +0200 @@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { @@ -133,9 +132,9 @@ diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.12.1/shell/e-shell-window-actions.c.help-contents evolution-3.12.1/shell/e-shell-window-actions.c ---- evolution-3.12.1/shell/e-shell-window-actions.c.help-contents 2014-03-23 02:13:19.000000000 +0100 -+++ evolution-3.12.1/shell/e-shell-window-actions.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/shell/e-shell-window-actions.c.help-contents evolution-3.13.6/shell/e-shell-window-actions.c +--- evolution-3.13.6/shell/e-shell-window-actions.c.help-contents 2014-03-07 14:49:13.000000000 +0100 ++++ evolution-3.13.6/shell/e-shell-window-actions.c 2014-09-22 09:15:05.053468361 +0200 @@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); diff --git a/evolution.spec b/evolution.spec index 4648ce5..951c6f7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -24,12 +24,12 @@ # Coverity scan can override this to 0, to skip checking in gtk-doc generated code %{!?with_docs: %define with_docs 1} -%define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins +%define evo_plugin_dir %{_libdir}/evolution/plugins ### Abstract ### Name: evolution -Version: 3.13.5 +Version: 3.13.6 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -382,68 +382,66 @@ rm -rf $RPM_BUILD_ROOT # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution -%{_datadir}/evolution/%{evo_base_version} +%{_datadir}/evolution # Modules: %dir %{_libdir}/evolution -%dir %{_libdir}/evolution/%{evo_base_version} -%dir %{_libdir}/evolution/%{evo_base_version}/modules -%{_libdir}/evolution/%{evo_base_version}/modules/module-addressbook.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-backup-restore.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-google.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-ldap.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-webdav.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-caldav.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-contacts.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-google.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-contact-photos.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-gravatar.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-itip-formatter.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-prefer-plain.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-settings.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so +%dir %{_libdir}/evolution/modules +%{_libdir}/evolution/modules/module-addressbook.so +%{_libdir}/evolution/modules/module-backup-restore.so +%{_libdir}/evolution/modules/module-book-config-google.so +%{_libdir}/evolution/modules/module-book-config-ldap.so +%{_libdir}/evolution/modules/module-book-config-local.so +%{_libdir}/evolution/modules/module-book-config-webdav.so +%{_libdir}/evolution/modules/module-cal-config-caldav.so +%{_libdir}/evolution/modules/module-cal-config-contacts.so +%{_libdir}/evolution/modules/module-cal-config-google.so +%{_libdir}/evolution/modules/module-cal-config-local.so +%{_libdir}/evolution/modules/module-cal-config-weather.so +%{_libdir}/evolution/modules/module-cal-config-webcal.so +%{_libdir}/evolution/modules/module-calendar.so +%{_libdir}/evolution/modules/module-composer-autosave.so +%{_libdir}/evolution/modules/module-contact-photos.so +%{_libdir}/evolution/modules/module-gravatar.so +%{_libdir}/evolution/modules/module-itip-formatter.so +%{_libdir}/evolution/modules/module-mail-config.so +%{_libdir}/evolution/modules/module-mail.so +%{_libdir}/evolution/modules/module-mailto-handler.so +%{_libdir}/evolution/modules/module-mdn.so +%{_libdir}/evolution/modules/module-offline-alert.so +%{_libdir}/evolution/modules/module-prefer-plain.so +%{_libdir}/evolution/modules/module-plugin-lib.so +%{_libdir}/evolution/modules/module-plugin-manager.so +%{_libdir}/evolution/modules/module-settings.so +%{_libdir}/evolution/modules/module-startup-wizard.so +%{_libdir}/evolution/modules/module-text-highlight.so +%{_libdir}/evolution/modules/module-vcard-inline.so +%{_libdir}/evolution/modules/module-web-inspector.so # Shared libraries: -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-composer.so -%{_libdir}/evolution/%{evo_base_version}/libeabutil.so -%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so -%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so -%{_libdir}/evolution/%{evo_base_version}/libemail-engine.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-formatter.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-shell.so -%{_libdir}/evolution/%{evo_base_version}/libessmime.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-util.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so -%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so +%{_libdir}/evolution/libevolution-mail-composer.so +%{_libdir}/evolution/libeabutil.so +%{_libdir}/evolution/libecontacteditor.so +%{_libdir}/evolution/libecontactlisteditor.so +%{_libdir}/evolution/libemail-engine.so +%{_libdir}/evolution/libevolution-mail-formatter.so +%{_libdir}/evolution/libevolution-shell.so +%{_libdir}/evolution/libessmime.so +%{_libdir}/evolution/libevolution-util.so +%{_libdir}/evolution/libevolution-addressbook-importers.so +%{_libdir}/evolution/libevolution-calendar.so +%{_libdir}/evolution/libevolution-calendar-importers.so +%{_libdir}/evolution/libevolution-mail-importers.so +%{_libdir}/evolution/libevolution-mail.so +%{_libdir}/evolution/libevolution-smime.so +%{_libdir}/evolution/libgnomecanvas.so # Various libexec programs: %dir %{_libexecdir}/evolution -%dir %{_libexecdir}/evolution/%{evo_base_version} -%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-export -%{_libexecdir}/evolution/%{evo_base_version}/evolution-alarm-notify -%{_libexecdir}/evolution/%{evo_base_version}/evolution-backup -%{_libexecdir}/evolution/%{evo_base_version}/killev +%{_libexecdir}/evolution/evolution-addressbook-export +%{_libexecdir}/evolution/evolution-alarm-notify +%{_libexecdir}/evolution/evolution-backup +%{_libexecdir}/evolution/killev # The plugin directory: %dir %{evo_plugin_dir} @@ -498,7 +496,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_includedir}/evolution-%{evo_base_version} +%{_includedir}/evolution %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc %{_libdir}/pkgconfig/evolution-shell-3.0.pc @@ -520,15 +518,15 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/module-bogofilter.so +%{_libdir}/evolution/modules/module-bogofilter.so %files spamassassin %defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/module-spamassassin.so +%{_libdir}/evolution/modules/module-spamassassin.so %files perl %defattr(-, root, root) -%{_libexecdir}/evolution/%{evo_base_version}/csv2vcard +%{_libexecdir}/evolution/csv2vcard %if %{libpst_support} %files pst @@ -542,6 +540,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 22 2014 Milan Crha - 3.13.6-1 +- Update to 3.13.6 + * Mon Aug 25 2014 Milan Crha - 3.13.5-1 - Update to 3.13.5 - Remove patch to add missing tests files in the distribution tarball (fixed upstream) diff --git a/sources b/sources index 32e445a..add920c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d984360b837a176e56db08a137ba799 evolution-3.13.5.tar.xz +af87482520c78a81ef4ec2feab588b49 evolution-3.13.6.tar.xz