rpms/gnumeric/F-9 gnumeric-1.8.2-desktop.patch, NONE, 1.1 gnumeric-1.8.2-python.patch, NONE, 1.1 gnumeric.spec, 1.39, 1.40

[Huzaifa Sidhpurwala]

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8442

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.2-desktop.patch gnumeric-1.8.2-python.patch 
Log Message:
Fix Bugzilla 481572


gnumeric-1.8.2-desktop.patch:

--- NEW FILE gnumeric-1.8.2-desktop.patch ---
--- gnumeric-1.8.2/gnumeric.desktop.in.desktop	2008-01-15 05:25:35.000000000 +0530
+++ gnumeric-1.8.2/gnumeric.desktop.in	2008-11-17 09:23:01.000000000 +0530
@@ -4,7 +4,7 @@
 _GenericName=Spreadsheet
 _Comment=Calculation, Analysis, and Visualization of Information
 Exec=gnumeric %F_OR_U
-Icon=gnome-gnumeric.png
+Icon=gnumeric.png
 Terminal=false
 Type=Application
 Categories=Application;Office;Spreadsheet;Science;Math;GNOME;GTK;

gnumeric-1.8.2-python.patch:

--- NEW FILE gnumeric-1.8.2-python.patch ---
diff -Naur gnumeric-1.8.2/plugins/python-loader/gnm-py-interpreter.c gnumeric-1.8.2.python/plugins/python-loader/gnm-py-interpreter.c
--- gnumeric-1.8.2/plugins/python-loader/gnm-py-interpreter.c	2008-01-14 18:55:07.000000000 -0500
+++ gnumeric-1.8.2.python/plugins/python-loader/gnm-py-interpreter.c	2009-01-29 01:19:22.000000000 -0500
@@ -101,6 +101,7 @@
 	interpreter->plugin = plugin;
 
 	PySys_SetArgv (G_N_ELEMENTS (plugin_argv) - 1, plugin_argv);
+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 	py_initgnumeric (interpreter);
 
 	return interpreter;


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-9/gnumeric.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnumeric.spec	18 Mar 2008 17:36:52 -0000	1.39
+++ gnumeric.spec	30 Jan 2009 10:13:57 -0000	1.40
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -9,8 +9,9 @@
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
-Patch0:           gnumeric-1.6.1-desktop.patch
+Patch0:           gnumeric-1.8.2-desktop.patch
 Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
+Patch2:		  gnumeric-1.8.2-python.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -61,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1
+%patch2 -p1 -b .new
 chmod -x plugins/excel/rc4.?
 
 
@@ -188,6 +190,8 @@
 
 
 %changelog
+* Fri Jan 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-3
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.8.2-2
 - add Requires for versioned perl (libperl.so)