rpms/gobject-introspection/devel py2.7-compat.patch, NONE, 1.1 gobject-introspection.spec, 1.43, 1.44

[dmalcolm]

Author: dmalcolm

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13522

Modified Files:
	gobject-introspection.spec 
Added Files:
	py2.7-compat.patch 
Log Message:
Cherrypick patch for python 2.7 compatibility (patch 1; rhbz#617782)


py2.7-compat.patch:
 sourcescanner.py |    2 +-
 xmlwriter.py     |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE py2.7-compat.patch ---
>From 7bcb292e7ff35764a02629213589f304df8b5076 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan at gnome.org>
Date: Thu, 22 Jul 2010 14:43:02 -0300
Subject: [PATCH] [scanner] Make it compatible with python 2.y

https://bugzilla.gnome.org/show_bug.cgi?id=618562
---
 giscanner/sourcescanner.py |    2 +-
 giscanner/xmlwriter.py     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index acfc048..ae3d29d 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -196,7 +196,7 @@ class SourceSymbol(object):
 class SourceScanner(object):
 
     def __init__(self):
-        with LibtoolImporter:
+        with LibtoolImporter(None, None):
             from giscanner._giscanner import SourceScanner
         self._scanner = SourceScanner()
         self._filenames = []
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 0db286b..c10bcc6 100644
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -67,7 +67,7 @@ def collect_attributes(tag_name, attributes, self_indent,
     return attr_value
 
 
-with LibtoolImporter:
+with LibtoolImporter(None, None):
     from giscanner._giscanner import collect_attributes
 
 
-- 
1.7.0.4

Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gobject-introspection.spec	19 Jul 2010 17:35:08 -0000	1.43
+++ gobject-introspection.spec	26 Jul 2010 10:42:05 -0000	1.44
@@ -3,7 +3,7 @@
 
 Name:           gobject-introspection
 Version:        0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:        Introspection system for GObject-based libraries
 
 Group:      Development/Libraries
@@ -13,6 +13,10 @@ URL:            http://live.gnome.org/GO
 Source0:	gobject-introspection-0.9.2.tar.gz
 Patch0:		0001-girepository-Actually-verify-header-of-loaded-typeli.patch
 
+# rhbz#617782
+# Taken from http://bugzilla-attachments.gnome.org/attachment.cgi?id=166409
+Patch1:         py2.7-compat.patch
+
 Obsoletes:	gir-repository
 
 BuildRequires:  glib2-devel
@@ -54,6 +58,7 @@ Libraries and headers for gobject-intros
 %prep
 %setup -q -n gobject-introspection-0.9.2
 %patch0 -p1
+%patch1 -p1
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -96,6 +101,9 @@ find $RPM_BUILD_ROOT -type f -name "*.a"
 %{_datadir}/gtk-doc/html/gi/*
 
 %changelog
+* Mon Jul 26 2010 David Malcolm <dmalcolm at redhat.com> - 0.9.2-5
+- Cherrypick patch for python 2.7 compatibility (patch 1; rhbz#617782)
+
 * Wed Jul 14 2010 Colin Walters <walters at verbum.org> - 0.9.2-4
 - Backport patch from upstream for better errors