From 11ccb4b2a8d42413f1af6af3d6f2fdf3bee3d4d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Oct 2011 13:13:16 -0400 Subject: [PATCH] Fix detection of evolution-help package. --- evolution-2.30.1-help-contents.patch | 5 +++-- evolution.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index 1c90903..e2b75a2 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c --- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents 2010-04-26 09:13:18.000000000 -0400 +++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400 -@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo +@@ -2001,6 +2001,15 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); @@ -9,7 +9,8 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evoluti + /* Viewing user documentation requires the evolution-help + * Fedora package. Look for one of the files it installs. */ + path = g_build_filename ( -+ EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL); ++ EVOLUTION_DATADIR, "gnome", "help", ++ PACKAGE, "C", "index.page", NULL); + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) + gtk_action_set_visible (ACTION (CONTENTS), FALSE); + g_free (path); diff --git a/evolution.spec b/evolution.spec index 4e04671..b08a4d5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -648,6 +648,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Oct 28 2011 Matthew Barnes - 3.2.1-2 +- Fix detection of evolution-help (not using OMF files anymore). + * Mon Oct 17 2011 Milan Crha - 3.2.1-1 - Update to 3.2.1