rpms/evolution/devel evolution-2.30.1-help-contents.patch, NONE, 1.1 evolution.spec, 1.441, 1.442

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1347

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.30.1-help-contents.patch 
Log Message:

* Fri May 07 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.1-2.fc14
- Require yelp in evolution-help (RH bug #589555).
- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
  is not installed).


evolution-2.30.1-help-contents.patch:
 e-shell-window-actions.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE evolution-2.30.1-help-contents.patch ---
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 *


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- evolution.spec	4 May 2010 09:19:54 -0000	1.441
+++ evolution.spec	8 May 2010 15:10:00 -0000	1.442
@@ -40,7 +40,7 @@
 
 Name: evolution
 Version: 2.31.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -63,6 +63,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# RH bug #589555
+Patch13: evolution-2.30.1-help-contents.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -170,6 +173,7 @@ Development files needed for building th
 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 impo
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch13 -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 at redhat.com> - 2.31.1-2.fc14
+- Require yelp in evolution-help (RH bug #589555).
+- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
+  is not installed).
+
 * Mon May 03 2010 Milan Crha <mcrha at redhat.com> - 2.31.1-1.fc14
 - Update to 2.31.1