diff --git a/.gitignore b/.gitignore index 0e33ead..f87880e 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.10.1.tar.xz /evolution-3.11.1.tar.xz /evolution-3.11.2.tar.xz +/evolution-3.11.4.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index 9e179f1..ed6ba6c 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.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2013-11-18 11:09:00.373861447 +0100 -@@ -4178,6 +4178,11 @@ e_contact_editor_init (EContactEditor *e +diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-01-13 08:31:03.314822806 +0100 ++++ evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c 2014-01-13 08:32:38.787818761 +0100 +@@ -4282,6 +4282,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); @@ -11,12 +11,12 @@ diff -up evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help + } + widget = e_builder_get_widget ( - e_contact_editor->builder, "button-web-expand"); + e_contact_editor->priv->builder, "button-web-expand"); g_signal_connect_swapped ( -diff -up evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.2/calendar/gui/dialogs/comp-editor.c ---- evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/calendar/gui/dialogs/comp-editor.c 2013-11-18 11:09:00.374861447 +0100 -@@ -2149,6 +2149,12 @@ comp_editor_init (CompEditor *editor) +diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.4/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents 2014-01-13 00:02:51.000000000 +0100 ++++ evolution-3.11.4/calendar/gui/dialogs/comp-editor.c 2014-01-13 08:31:03.315822806 +0100 +@@ -2169,6 +2169,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,10 +29,10 @@ diff -up evolution-3.11.2/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.11.2/e-util/e-misc-utils.c.help-contents evolution-3.11.2/e-util/e-misc-utils.c ---- evolution-3.11.2/e-util/e-misc-utils.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/e-util/e-misc-utils.c 2013-11-18 11:09:00.374861447 +0100 -@@ -2099,3 +2099,20 @@ e_binding_transform_uid_to_source (GBind +diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e-util/e-misc-utils.c +--- evolution-3.11.4/e-util/e-misc-utils.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-misc-utils.c 2014-01-13 08:31:03.315822806 +0100 +@@ -2098,3 +2098,20 @@ e_binding_transform_uid_to_source (GBind return success; } @@ -53,10 +53,10 @@ diff -up evolution-3.11.2/e-util/e-misc-utils.c.help-contents evolution-3.11.2/e + + return is_installed; +} -diff -up evolution-3.11.2/e-util/e-misc-utils.h.help-contents evolution-3.11.2/e-util/e-misc-utils.h ---- evolution-3.11.2/e-util/e-misc-utils.h.help-contents 2013-10-30 23:08:03.000000000 +0100 -+++ evolution-3.11.2/e-util/e-misc-utils.h 2013-11-18 11:09:00.375861447 +0100 -@@ -185,6 +185,8 @@ gboolean e_binding_transform_uid_to_sour +diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e-util/e-misc-utils.h +--- evolution-3.11.4/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-misc-utils.h 2014-01-13 08:31:03.316822806 +0100 +@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -65,10 +65,10 @@ diff -up evolution-3.11.2/e-util/e-misc-utils.h.help-contents evolution-3.11.2/e G_END_DECLS #endif /* E_MISC_UTILS_H */ -diff -up evolution-3.11.2/e-util/e-preferences-window.c.help-contents evolution-3.11.2/e-util/e-preferences-window.c ---- evolution-3.11.2/e-util/e-preferences-window.c.help-contents 2013-10-30 23:08:07.000000000 +0100 -+++ evolution-3.11.2/e-util/e-preferences-window.c 2013-11-18 11:09:00.375861447 +0100 -@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW +diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution-3.11.4/e-util/e-preferences-window.c +--- evolution-3.11.4/e-util/e-preferences-window.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-preferences-window.c 2014-01-13 08:31:03.316822806 +0100 +@@ -384,6 +384,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,10 +80,10 @@ diff -up evolution-3.11.2/e-util/e-preferences-window.c.help-contents evolution- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2/e-util/e-send-options.c ---- evolution-3.11.2/e-util/e-send-options.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/e-util/e-send-options.c 2013-11-18 11:09:00.375861447 +0100 -@@ -440,6 +440,7 @@ get_widgets (ESendOptionsDialog *sod) +diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4/e-util/e-send-options.c +--- evolution-3.11.4/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-send-options.c 2014-01-13 08:31:03.316822806 +0100 +@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; GtkBuilder *builder; @@ -91,7 +91,7 @@ diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2 priv = sod->priv; builder = sod->priv->builder; -@@ -479,6 +480,12 @@ get_widgets (ESendOptionsDialog *sod) +@@ -478,6 +479,12 @@ get_widgets (ESendOptionsDialog *sod) priv->accepted_label = e_builder_get_widget (builder, "accepted-label"); priv->completed_label = e_builder_get_widget (builder, "completed-label"); @@ -104,10 +104,10 @@ diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2 return (priv->priority && priv->security && priv->status -diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.2/plugins/email-custom-header/email-custom-header.c ---- evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/plugins/email-custom-header/email-custom-header.c 2013-11-18 11:09:00.375861447 +0100 -@@ -27,6 +27,7 @@ +diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.4/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/plugins/email-custom-header/email-custom-header.c 2014-01-13 08:31:03.316822806 +0100 +@@ -26,6 +26,7 @@ #include #include @@ -115,7 +115,7 @@ diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help #include "mail/em-utils.h" #include "mail/em-event.h" #include "composer/e-msg-composer.h" -@@ -117,6 +118,8 @@ static gboolean +@@ -116,6 +117,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { CustomHeaderOptionsDialogPrivate *priv; @@ -124,7 +124,7 @@ diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help priv = mch->priv; #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) -@@ -127,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi +@@ -126,6 +129,13 @@ epech_get_widgets (CustomHeaderOptionsDi priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); @@ -138,10 +138,10 @@ diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.11.2/shell/e-shell-window-actions.c.help-contents evolution-3.11.2/shell/e-shell-window-actions.c ---- evolution-3.11.2/shell/e-shell-window-actions.c.help-contents 2013-10-30 23:08:15.000000000 +0100 -+++ evolution-3.11.2/shell/e-shell-window-actions.c 2013-11-18 11:09:00.376861447 +0100 -@@ -1414,6 +1414,11 @@ e_shell_window_actions_init (EShellWindo +diff -up evolution-3.11.4/shell/e-shell-window-actions.c.help-contents evolution-3.11.4/shell/e-shell-window-actions.c +--- evolution-3.11.4/shell/e-shell-window-actions.c.help-contents 2014-01-07 23:08:55.000000000 +0100 ++++ evolution-3.11.4/shell/e-shell-window-actions.c 2014-01-13 08:31:03.317822806 +0100 +@@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); diff --git a/evolution.spec b/evolution.spec index 1be7d3c..746ac27 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,8 +33,8 @@ ### Abstract ### Name: evolution -Version: 3.11.2 -Release: 2%{?dist} +Version: 3.11.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -58,6 +58,7 @@ Patch02: evolution-2.30.1-help-contents.patch Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs +Requires: gtkspell3 Requires: highlight ### Build Dependencies ### @@ -80,6 +81,7 @@ BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: gtkspell3-devel BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool @@ -132,6 +134,7 @@ Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} +Requires: gtkspell3-devel Requires: libgdata-devel >= %{libgdata_version} Requires: libgweather-devel >= %{libgweather_version} Requires: libsoup-devel >= %{libsoup_version} @@ -547,6 +550,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 13 2014 Milan Crha - 3.11.4-1 +- Update to 3.11.4 + * Thu Nov 21 2013 Milan Crha - 3.11.2-2 - Rebuild for new libical (RH bug #1023020) diff --git a/sources b/sources index 20d3c63..18c798b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c47d39795ff43dc13a7a2915e371f533 evolution-3.11.2.tar.xz +73e630eda6052130a0a6d6bc36bcb7f4 evolution-3.11.4.tar.xz