Update to 3.15.92; Remove obsolete patches (one unused and one fixed upstream)

.gitignore

@@ -85,3 +85,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.13.10.tar.xz
 /evolution-3.13.90.tar.xz
 /evolution-3.15.91.tar.xz
+/evolution-3.15.92.tar.xz

evolution-1.4.4-ldap-x86_64-hack.patch

@@ -1,21 +0,0 @@
-diff -up evolution-2.31.1/configure.ldaphack evolution-2.31.1/configure
---- evolution-2.31.1/configure.ldaphack	2010-05-03 12:43:34.000000000 +0200
-+++ evolution-2.31.1/configure	2010-05-03 19:22:55.000000000 +0200
-@@ -15797,7 +15797,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
-+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -16129,7 +16129,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
-+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 

evolution-2.30.1-help-contents.patch

@@ -1,149 +0,0 @@
-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);
-+	if (!e_misc_utils_is_help_package_installed ()) {
-+		gtk_widget_set_sensitive (widget, FALSE);
-+		gtk_widget_hide (widget);
-+	}
- 
- 	widget = e_builder_get_widget (
- 		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);
- 	}
- 
-+	action = gtk_action_group_get_action (action_group, "help");
-+	if (action && !e_misc_utils_is_help_package_installed ()) {
-+		gtk_action_set_visible (action, FALSE);
-+		gtk_action_set_sensitive (action, FALSE);
-+	}
-+
- 	action_group = gtk_action_group_new ("individual");
- 	gtk_action_group_set_translation_domain (
- 		action_group, GETTEXT_PACKAGE);
-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;
- }
- 
-+gboolean
-+e_misc_utils_is_help_package_installed (void)
-+{
-+	gboolean is_installed;
-+	gchar *path;
-+
-+	/* Viewing user documentation requires the evolution-help
-+	 * package. Look for one of the files it installs. */
-+	path = g_build_filename (EVOLUTION_DATADIR, "help", "C", PACKAGE, "index.page", NULL);
-+
-+	is_installed = g_file_test (path, G_FILE_TEST_IS_REGULAR);
-+
-+	g_free (path);
-+
-+	return is_installed;
-+}
-+
- /**
-  * e_binding_transform_text_non_null:
-  * @binding: a #GBinding
-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);
- 
-+gboolean	e_misc_utils_is_help_package_installed (void);
-+
- gboolean	e_binding_transform_text_non_null
- 						(GBinding *binding,
- 						 const GValue *source_value,
-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);
- 
-+	if (!e_misc_utils_is_help_package_installed ()) {
-+		gtk_widget_set_sensitive (widget, FALSE);
-+		gtk_widget_hide (widget);
-+	}
-+
- 	widget = e_dialog_button_new_with_icon ("window-close", _("_Close"));
- 	g_signal_connect_swapped (
- 		widget, "clicked",
-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;
- 	GtkBuilder *builder;
-+	GtkWidget *helpbutton;
- 
- 	priv = sod->priv;
- 	builder = sod->priv->builder;
-@@ -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");
- 
-+	helpbutton = e_builder_get_widget (builder, "helpbutton1");
-+	if (helpbutton && !e_misc_utils_is_help_package_installed ()) {
-+		gtk_widget_set_sensitive (helpbutton, FALSE);
-+		gtk_widget_hide (helpbutton);
-+	}
-+
- 	return (priv->priority
- 		&& priv->security
- 		&& priv->status
-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)
- {
- 	CustomHeaderOptionsDialogPrivate *priv;
-+	GtkWidget *helpbutton;
-+
- 	priv = mch->priv;
- 
- #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name)
-@@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi
- 
- 	priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
- 	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
-+
-+	helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1");
-+	if (helpbutton && !e_misc_utils_is_help_package_installed ()) {
-+		gtk_widget_set_sensitive (helpbutton, FALSE);
-+		gtk_widget_hide (helpbutton);
-+	}
-+
- #undef EMAIL_CUSTOM_HEADER
- 
- 	return (priv->page
-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);
- 	g_free (path);
-+
-+	if (!e_misc_utils_is_help_package_installed ()) {
-+		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
-+		gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
-+	}
- }
- 
- GtkWidget *

evolution.spec

@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.15.91
+Version: 3.15.92
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -43,11 +43,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
 
 ### Patches ###
 
-# bad hack
+# RH bug #
-Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
+#Patch01: .patch
-
-# RH bug #589555
-Patch02: evolution-2.30.1-help-contents.patch
 
 ## Dependencies ###
 
@@ -209,8 +206,7 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n evolution-%{version}
-%patch01 -p1 -b .ldaphack
+#%patch01 -p1 -b .backup
-%patch02 -p1 -b .help-contents
 
 # Remove the welcome email from Novell
 for inbox in mail/default/*/Inbox; do
@@ -538,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Mar 16 2015 Milan Crha <mcrha@redhat.com> - 3.15.92-1
+- Update to 3.15.92
+- Remove obsolete patches (one unused and one fixed upstream)
+
 * Mon Mar 02 2015 Milan Crha <mcrha@redhat.com> - 3.15.91-1
 - Update to 3.15.91
 

sources

@@ -1 +1 @@
-141b78120d0e9c7882c532b3a3d401f0  evolution-3.15.91.tar.xz
+f17f93d152c17d57b1b8075308698ffd  evolution-3.15.92.tar.xz