diff --git a/gedit-2.25.5-fix-python-path.patch b/gedit-2.25.5-fix-python-path.patch index 49fd077..2274841 100644 --- a/gedit-2.25.5-fix-python-path.patch +++ b/gedit-2.25.5-fix-python-path.patch @@ -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) \ diff --git a/gedit.spec b/gedit.spec index ba9c12e..d19a7f7 100644 --- a/gedit.spec +++ b/gedit.spec @@ -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 - 1:2.29.3-2 +- Rebase fix python path patch. + * Tue Dec 01 2009 Bastien Nocera 2.29.3-1 - Update to 2.29.3