rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.12.1

Browse Source
This commit is contained in:
Milan Crha 2014-04-14 11:17:09 +02:00
parent 9cd2679ec3
commit bd4d130074
4 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -72,3 +72,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.11.91.tar.xz /evolution-3.11.91.tar.xz
/evolution-3.11.92.tar.xz /evolution-3.11.92.tar.xz
/evolution-3.12.0.tar.xz /evolution-3.12.0.tar.xz
/evolution-3.12.1.tar.xz

65
evolution-2.30.1-help-contents.patch
View File

@ -1,6 +1,6 @@
diff -up evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c 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.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 --- evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200
+++ evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c 2014-03-03 13:37:40.924928474 +0100 +++ 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 @@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e
g_signal_connect ( g_signal_connect (
widget, "clicked", widget, "clicked",
@ -13,9 +13,9 @@ diff -up evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.hel
widget = e_builder_get_widget ( widget = e_builder_get_widget (
e_contact_editor->priv->builder, "button-web-expand"); e_contact_editor->priv->builder, "button-web-expand");
g_signal_connect_swapped ( g_signal_connect_swapped (
diff -up evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.91/calendar/gui/dialogs/comp-editor.c 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.11.91/calendar/gui/dialogs/comp-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 --- evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200
+++ evolution-3.11.91/calendar/gui/dialogs/comp-editor.c 2014-03-03 13:37:40.924928474 +0100 +++ evolution-3.12.1/calendar/gui/dialogs/comp-editor.c 2014-04-14 11:15:36.606320997 +0200
@@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) @@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor)
G_BINDING_SYNC_CREATE); G_BINDING_SYNC_CREATE);
} }
@ -29,14 +29,13 @@ diff -up evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents evol
action_group = gtk_action_group_new ("individual"); action_group = gtk_action_group_new ("individual");
gtk_action_group_set_translation_domain ( gtk_action_group_set_translation_domain (
action_group, GETTEXT_PACKAGE); action_group, GETTEXT_PACKAGE);
diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91/e-util/e-misc-utils.c 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.11.91/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100 --- evolution-3.12.1/e-util/e-misc-utils.c.help-contents 2014-04-14 11:15:36.606320997 +0200
+++ evolution-3.11.91/e-util/e-misc-utils.c 2014-03-03 13:37:40.925928474 +0100 +++ evolution-3.12.1/e-util/e-misc-utils.c 2014-04-14 11:15:47.698320550 +0200
@@ -2102,3 +2102,20 @@ e_binding_transform_uid_to_source (GBind @@ -2103,6 +2103,23 @@ e_binding_transform_uid_to_source (GBind
return success; return success;
} }
+
+gboolean +gboolean
+e_misc_utils_is_help_package_installed (void) +e_misc_utils_is_help_package_installed (void)
+{ +{
@ -53,21 +52,25 @@ diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91
+ +
+ return is_installed; + return is_installed;
+} +}
diff -up evolution-3.11.91/e-util/e-misc-utils.h.help-contents evolution-3.11.91/e-util/e-misc-utils.h +
--- evolution-3.11.91/e-util/e-misc-utils.h.help-contents 2014-03-03 01:37:23.000000000 +0100 /**
+++ evolution-3.11.91/e-util/e-misc-utils.h 2014-03-03 13:37:40.925928474 +0100 * 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 @@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour
GValue *target_value, GValue *target_value,
ESourceRegistry *registry); ESourceRegistry *registry);
+gboolean e_misc_utils_is_help_package_installed (void); +gboolean e_misc_utils_is_help_package_installed (void);
+ +
G_END_DECLS gboolean e_binding_transform_text_non_null
(GBinding *binding,
#endif /* E_MISC_UTILS_H */ const GValue *source_value,
diff -up evolution-3.11.91/e-util/e-preferences-window.c.help-contents evolution-3.11.91/e-util/e-preferences-window.c 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.11.91/e-util/e-preferences-window.c.help-contents 2014-02-16 15:11:01.000000000 +0100 --- evolution-3.12.1/e-util/e-preferences-window.c.help-contents 2014-03-23 02:13:17.000000000 +0100
+++ evolution-3.11.91/e-util/e-preferences-window.c 2014-03-03 13:37:40.925928474 +0100 +++ evolution-3.12.1/e-util/e-preferences-window.c 2014-04-14 11:15:36.607320997 +0200
@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW
GTK_BUTTON_BOX (container), widget, TRUE); GTK_BUTTON_BOX (container), widget, TRUE);
gtk_widget_show (widget); gtk_widget_show (widget);
@ -80,9 +83,9 @@ diff -up evolution-3.11.91/e-util/e-preferences-window.c.help-contents evolution
widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); widget = e_dialog_button_new_with_icon ("window-close", _("_Close"));
g_signal_connect_swapped ( g_signal_connect_swapped (
widget, "clicked", widget, "clicked",
diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11.91/e-util/e-send-options.c 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.11.91/e-util/e-send-options.c.help-contents 2014-03-03 01:37:23.000000000 +0100 --- evolution-3.12.1/e-util/e-send-options.c.help-contents 2014-04-13 16:33:29.000000000 +0200
+++ evolution-3.11.91/e-util/e-send-options.c 2014-03-03 13:37:40.925928474 +0100 +++ evolution-3.12.1/e-util/e-send-options.c 2014-04-14 11:15:36.607320997 +0200
@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod)
{ {
ESendOptionsDialogPrivate *priv; ESendOptionsDialogPrivate *priv;
@ -104,9 +107,9 @@ diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11.
return (priv->priority return (priv->priority
&& priv->security && priv->security
&& priv->status && priv->status
diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.91/plugins/email-custom-header/email-custom-header.c 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.11.91/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-03 01:37:23.000000000 +0100 --- evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-23 02:13:18.000000000 +0100
+++ evolution-3.11.91/plugins/email-custom-header/email-custom-header.c 2014-03-03 13:39:03.723924965 +0100 +++ evolution-3.12.1/plugins/email-custom-header/email-custom-header.c 2014-04-14 11:15:36.607320997 +0200
@@ -118,6 +118,8 @@ static gboolean @@ -118,6 +118,8 @@ static gboolean
epech_get_widgets (CustomHeaderOptionsDialog *mch) epech_get_widgets (CustomHeaderOptionsDialog *mch)
{ {
@ -130,10 +133,10 @@ diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.hel
#undef EMAIL_CUSTOM_HEADER #undef EMAIL_CUSTOM_HEADER
return (priv->page return (priv->page
diff -up evolution-3.11.91/shell/e-shell-window-actions.c.help-contents evolution-3.11.91/shell/e-shell-window-actions.c 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.11.91/shell/e-shell-window-actions.c.help-contents 2014-02-17 15:53:16.000000000 +0100 --- evolution-3.12.1/shell/e-shell-window-actions.c.help-contents 2014-03-23 02:13:19.000000000 +0100
+++ evolution-3.11.91/shell/e-shell-window-actions.c 2014-03-03 13:37:40.926928474 +0100 +++ evolution-3.12.1/shell/e-shell-window-actions.c 2014-04-14 11:15:36.607320997 +0200
@@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo @@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo
if (path == NULL) if (path == NULL)
gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
g_free (path); g_free (path);

5
evolution.spec
View File

@ -30,7 +30,7 @@
### Abstract ### ### Abstract ###
Name: evolution Name: evolution
Version: 3.12.0 Version: 3.12.1
Release: 1%{?dist} Release: 1%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Mon Apr 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.1-1
- Update to 3.12.1
* Mon Mar 24 2014 Milan Crha <mcrha@redhat.com> - 3.12.0-1 * Mon Mar 24 2014 Milan Crha <mcrha@redhat.com> - 3.12.0-1
- Update to 3.12.0 - Update to 3.12.0

2
sources
View File

@ -1 +1 @@
5ec7a2828eef2dac3da2a1de18d1188c evolution-3.12.0.tar.xz 03fd35c2ec39a90221c16400f8797623 evolution-3.12.1.tar.xz