rpms/gnumeric/FC-5 gnumeric-1.6.3-helppath.patch, NONE, 1.1 gnumeric.spec, 1.17, 1.18

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19385

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.6.3-helppath.patch 
Log Message:
* Sun May 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-2
- Add Patch3 fixing gnumeric not finding its help files (bz 192581).


gnumeric-1.6.3-helppath.patch:

--- NEW FILE gnumeric-1.6.3-helppath.patch ---
--- gnumeric-1.6.3/src/wbcg-actions.c~	2006-05-21 15:36:33.000000000 +0200
+++ gnumeric-1.6.3/src/wbcg-actions.c	2006-05-21 15:36:33.000000000 +0200
@@ -910,7 +910,7 @@
 #warning "handle translations when we generate them"
 #ifndef G_OS_WIN32
 	argv[0] = (char *)"yelp";
-	argv[1] = g_build_filename (gnm_sys_data_dir (), "doc", "C",
+	argv[1] = g_build_filename ("/usr/share/gnome/help/gnumeric", "C",
 			"gnumeric.xml", NULL);
 #else
 	argv[0] = (char *)"hh";


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/FC-5/gnumeric.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnumeric.spec	6 May 2006 07:55:55 -0000	1.17
+++ gnumeric.spec	21 May 2006 13:59:50 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:          Spreadsheet program for GNOME
 Name:             gnumeric
 Version:          1.6.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 Epoch:            1
 License:          GPL
 Group:            Applications/Productivity
@@ -21,6 +21,7 @@
 BuildRequires:    guile-devel
 Patch0:           gnumeric-1.6.1-desktop.patch
 Patch1:           gnumeric-1.4.1-excelcrash.patch
+Patch2:           gnumeric-1.6.3-helppath.patch
 Requires(pre):    GConf2
 Requires(post):   /sbin/ldconfig GConf2 scrollkeeper
 Requires(preun):  GConf2
@@ -46,6 +47,7 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .excelcrash
+%patch2 -p1 -b .helppath
 
 
 %build
@@ -166,6 +168,9 @@
 
 
 %changelog
+* Sun May 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-2
+- Add Patch3 fixing gnumeric not finding its help files (bz 192581).
+
 * Tue May  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-1
 - new upstream version 1.6.3