From d599a29ba41d8aa0ac3651306467017224d172ab Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 14 Oct 2013 10:18:08 +0200
Subject: [PATCH] - Update to 3.10.1 - Remove the dependency on libytnef, which
 apparently isn't needed for   the PST importer and disable the experimental
 TNEF attachments plugin - Avoid help launch with F1 when evolution-help is
 not installed

---
 .gitignore                           |  1 +
 evolution-2.30.1-help-contents.patch | 12 +++++++-----
 evolution.spec                       | 10 +++++++---
 sources                              |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 124af6c..7b80690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.91.tar.xz
 /evolution-3.9.92.tar.xz
 /evolution-3.10.0.tar.xz
+/evolution-3.10.1.tar.xz
diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch
index e0b27af..650e6de 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.9.1/shell/e-shell-window-actions.c.help-contents evolution-3.9.1/shell/e-shell-window-actions.c
---- evolution-3.9.1/shell/e-shell-window-actions.c.help-contents	2013-04-29 11:23:28.943063568 +0200
-+++ evolution-3.9.1/shell/e-shell-window-actions.c	2013-04-29 11:24:16.701599684 +0200
-@@ -1396,6 +1396,15 @@ e_shell_window_actions_init (EShellWindo
+diff -up evolution-3.10.0/shell/e-shell-window-actions.c.help-contents evolution-3.10.0/shell/e-shell-window-actions.c
+--- evolution-3.10.0/shell/e-shell-window-actions.c.help-contents	2013-09-07 18:34:59.000000000 +0200
++++ evolution-3.10.0/shell/e-shell-window-actions.c	2013-10-10 08:51:03.863987108 +0200
+@@ -1414,6 +1414,17 @@ e_shell_window_actions_init (EShellWindo
  	if (path == NULL)
  		gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
  	g_free (path);
@@ -11,8 +11,10 @@ diff -up evolution-3.9.1/shell/e-shell-window-actions.c.help-contents evolution-
 +	path = g_build_filename (
 +		EVOLUTION_DATADIR, "help", "C",
 +		PACKAGE, "index.page", NULL);
-+	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
 +		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++		gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
++	}
 +	g_free (path);
  }
  
diff --git a/evolution.spec b/evolution.spec
index 9f920f3..a6ccd90 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.10.0
+Version: 3.10.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -114,7 +114,6 @@ BuildRequires: libnotify-devel
 
 %if %{libpst_support}
 BuildRequires: libpst-devel
-BuildRequires: libytnef-devel
 %endif
 
 %description
@@ -407,7 +406,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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-tnef-attachment.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so
 
@@ -532,6 +530,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 14 2013 Milan Crha <mcrha@redhat.com> - 3.10.1-1
+- Update to 3.10.1
+- Remove the dependency on libytnef, which apparently isn't needed for
+  the PST importer and disable the experimental TNEF attachments plugin
+- Avoid help launch with F1 when evolution-help is not installed
+
 * Mon Sep 23 2013 Milan Crha <mcrha@redhat.com> - 3.10.0-1
 - Update to 3.10.0
 - Remove explicit Requires on libpst in pst subpackage
diff --git a/sources b/sources
index 4fd31eb..1dfcd1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01c3f4f73bc236b95f74afedf9f463ca  evolution-3.10.0.tar.xz
+53199a7863b23d177774362d33993774  evolution-3.10.1.tar.xz