rpms/evolution
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Require yelp in evolution-help (RH bug #589555).

Browse source 
- Add patch for RH bug #589555 (hide Help->Contents if evolution-help is
    not installed).
This commit is contained in:
Matthew Barnes 2010-05-08 03:59:00 +00:00
commit 344a73d3f3
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
evolution-2.30.1-help-contents.patch Normal file
View file

@ -0,0 +1,18 @@
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
if (path == NULL)
gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE);
g_free (path);
+
+ /* 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);
+ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
+ gtk_action_set_visible (ACTION (CONTENTS), FALSE);
+ g_free (path);
}
static GList *

12
evolution.spec
View file

@ -39,7 +39,7 @@
Name: evolution
Version: 2.30.1
Release: 3%{?dist}
Release: 4%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -65,6 +65,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch
# Fixes the giant "mail-mark-notjunk" icon.
Patch13: evolution-2.30.1.2-notjunk-icon.patch
# RH bug #589555
Patch14: evolution-2.30.1-help-contents.patch
## Dependencies ###
Requires(pre): GConf2
@ -169,6 +172,7 @@ Development files needed for building things which link against %{name}.
Group: Applications/Productivity
Summary: Help files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: yelp
BuildArch: noarch
%description help
@ -230,6 +234,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
%patch11 -p1 -b .fix-conduit-dir
%patch12 -p1 -b .im-context-reset
%patch13 -p1 -b .notjunk-icon
%patch14 -p1 -b .help-contents
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -681,6 +686,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Fri May 07 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-4.fc13
- Require yelp in evolution-help (RH bug #589555).
- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
is not installed).
* Sat May 01 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-3.fc13
- Add patch to fix the giant "mail-mark-notjunk" icon.