rpms/pygtk2/devel pygtk-2.9.1-use-complete-include-path.patch, NONE, 1.1 pygtk.spec, 1.53, 1.54

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14135

Modified Files:
	pygtk.spec 
Added Files:
	pygtk-2.9.1-use-complete-include-path.patch 
Log Message:
- Use full include path for defs parser


pygtk-2.9.1-use-complete-include-path.patch:
 defsparser.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pygtk-2.9.1-use-complete-include-path.patch ---
--- pygtk-2.9.1/codegen/defsparser.py.use-complete-include-path	2006-06-15 22:44:32.000000000 -0400
+++ pygtk-2.9.1/codegen/defsparser.py	2006-06-15 22:45:09.000000000 -0400
@@ -11,7 +11,7 @@
     def include(self, input_filename):
         global include_path
         if os.path.isabs(input_filename):
-            filename = os.path.join(os.path.dirname(self.filename), input_filename)
+            filename = os.path.join(os.path.dirname(self.filename), os.path.dirname(input_filename))
             # set self.filename to the include name, to handle recursive includes
             oldfile = self.filename
             self.filename = filename
@@ -20,7 +20,7 @@
         else:
             inc_path = [os.path.dirname(self.filename)] + include_path
             for filename in [os.path.join(path_entry, input_filename)
-                             for path_entry in include_path]:
+                             for path_entry in inc_path]:
                 if not os.path.exists(filename):
                     continue
                 # set self.filename to the include name, to handle recursive includes


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pygtk.spec	14 Jun 2006 19:29:02 -0000	1.53
+++ pygtk.spec	16 Jun 2006 02:47:43 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.1
-Release: 2 
+Release: 3
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -26,6 +26,8 @@
 BuildRequires: pygobject2-devel >= 2.10.1 
 BuildRequires: libtool
 
+Patch0: pygtk-2.9.1-use-complete-include-path.patch
+
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
 widget set.  Just about anything you can write in C with GTK+ you can write
@@ -54,6 +56,7 @@
 
 %prep
 %setup -q -n pygtk-%{version}
+%patch0 -p1 -b .use-complete-include-path
 
 %build
 %configure --enable-thread --enable-numpy
@@ -112,6 +115,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 2.9.1-3
+- Use full include path for defs parser
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
 - Fix missing BuildRequries