rpms/gedit/devel gedit-2.25.5-fix-python-path.patch, 1.2, 1.3 gedit.spec, 1.206, 1.207

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5625

Modified Files:
	gedit-2.25.5-fix-python-path.patch gedit.spec 
Log Message:
* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:2.29.3-2
- Rebase fix python path patch.


gedit-2.25.5-fix-python-path.patch:
 Makefile.am                  |    1 +
 gedit-plugin-loader-python.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: gedit-2.25.5-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit-2.25.5-fix-python-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gedit-2.25.5-fix-python-path.patch	26 Jan 2009 20:52:25 -0000	1.2
+++ gedit-2.25.5-fix-python-path.patch	1 Dec 2009 16:48:30 -0000	1.3
@@ -1,18 +1,18 @@
-diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
---- gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path	2009-01-12 11:23:48.000000000 -0500
-+++ gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c	2009-01-26 15:35:30.672713673 -0500
-@@ -488,7 +488,7 @@ gedit_python_init (GeditPluginLoaderPyth
+diff -urp gedit-2.29.3.orig/plugin-loaders/python/gedit-plugin-loader-python.c gedit-2.29.3/plugin-loaders/python/gedit-plugin-loader-python.c
+--- gedit-2.29.3.orig/plugin-loaders/python/gedit-plugin-loader-python.c	2009-11-28 13:47:48.000000000 -0500
++++ gedit-2.29.3/plugin-loaders/python/gedit-plugin-loader-python.c	2009-12-01 11:33:02.635871946 -0500
+@@ -486,7 +486,7 @@ gedit_python_init (GeditPluginLoaderPyth
+ 	PyObject *mdict, *tuple;
+ 	PyObject *gedit, *geditutils, *geditcommands, *geditplugins;
  	PyObject *gettext, *install, *gettext_args;
- 	struct sigaction old_sigint;
- 	gint res;
 -	char *argv[] = { "gedit", NULL };
 +	char *argv[] = { GEDIT_PLUGINS_LIBS_DIR, NULL };
- 
- 	if (loader->priv->init_failed)
- 	{
-diff -up gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path gedit-2.25.5/plugin-loaders/python/Makefile.am
---- gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path	2009-01-26 15:51:12.102965135 -0500
-+++ gedit-2.25.5/plugin-loaders/python/Makefile.am	2009-01-26 15:35:49.978712718 -0500
+ #ifdef HAVE_SIGACTION
+ 	gint res;
+ 	struct sigaction old_sigint;
+diff -urp gedit-2.29.3.orig/plugin-loaders/python/Makefile.am gedit-2.29.3/plugin-loaders/python/Makefile.am
+--- gedit-2.29.3.orig/plugin-loaders/python/Makefile.am	2009-09-20 13:43:50.000000000 -0400
++++ gedit-2.29.3/plugin-loaders/python/Makefile.am	2009-12-01 11:33:44.012872511 -0500
 @@ -13,6 +13,7 @@ INCLUDES = \
  	$(DISABLE_DEPRECATED_CFLAGS)					\
  	$(PYGTK_CFLAGS)							\


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- gedit.spec	1 Dec 2009 14:55:54 -0000	1.206
+++ gedit.spec	1 Dec 2009 16:48:30 -0000	1.207
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.29.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:2.29.3-2
+- Rebase fix python path patch.
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3