Fix detection of evolution-help package.

This commit is contained in:
Matthew Barnes 2011-10-28 13:16:30 -04:00
parent 23fd26fe9f
commit 43fc9093ca
2 changed files with 7 additions and 3 deletions

View File

@ -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);

View File

@ -28,7 +28,7 @@
Name: evolution
Version: 3.3.1
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -651,6 +651,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Fri Oct 28 2011 Matthew Barnes <mbarnes@redhat.com> - 3.3.1-2
- Fix detection of evolution-help (not using OMF files anymore).
* Mon Oct 24 2011 Milan Crha <mcrha@redhat.com> - 3.3.1-1
- Update to 3.3.1
- Add patch to not call g_thread_init()