rpms/gedit/F-10 gedit-2.24.3-fix-python-path.patch, 1.3, 1.4 gedit.spec, 1.175, 1.176

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16380

Modified Files:
	gedit-2.24.3-fix-python-path.patch gedit.spec 
Log Message:
- Fix bug 481556 in a more functional way


gedit-2.24.3-fix-python-path.patch:

Index: gedit-2.24.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit-2.24.3-fix-python-path.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gedit-2.24.3-fix-python-path.patch	26 Jan 2009 18:28:01 -0000	1.3
+++ gedit-2.24.3-fix-python-path.patch	26 Jan 2009 21:29:31 -0000	1.4
@@ -1,13 +1,12 @@
 diff -up gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path gedit-2.24.3/gedit/gedit-python-module.c
 --- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-07 10:39:41.000000000 -0500
-+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 13:27:01.917963137 -0500
-@@ -373,6 +373,9 @@ gedit_python_init (void)
++++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 16:27:27.028988285 -0500
+@@ -318,7 +318,7 @@ gedit_python_init (void)
+ 	PyObject *gettext, *install, *gettext_args;
+ 	struct sigaction old_sigint;
+ 	gint res;
+-	char *argv[] = { "gedit", NULL };
++	char *argv[] = { GEDIT_PLUGINS_DIR, NULL };
+ 	
+ 	static gboolean init_failed = FALSE;
  
- 	PySys_SetArgv (1, argv);
- 
-+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
-+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
-+
- 	if (!check_pygtk2 ())
- 	{
- 		/* Warning message already printed in check_pygtk2 */


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gedit.spec	26 Jan 2009 17:50:52 -0000	1.175
+++ gedit.spec	26 Jan 2009 21:29:31 -0000	1.176
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.24.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -223,6 +223,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.24.3-3
+- Fix bug 481556 in a more functional way
+
 * Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.24.3-2
 - Fix up python plugin path to close up a security attack
   vectors (bug 481556).