From 067def344261cb1ac34fb4a98555d98d18c8e2a5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Tue, 21 Oct 2008 18:20:35 +0000
Subject: [PATCH] - Add 2-liner fixing the load_contents functions not working
 appropriately

---
 pygobject-gio-load-contents.patch | 22 ++++++++++++++++++++++
 pygobject2.spec                   |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pygobject-gio-load-contents.patch

diff --git a/pygobject-gio-load-contents.patch b/pygobject-gio-load-contents.patch
new file mode 100644
index 0000000..417b6e0
--- /dev/null
+++ b/pygobject-gio-load-contents.patch
@@ -0,0 +1,22 @@
+Index: gio/gfile.override
+===================================================================
+--- gio/gfile.override	(revision 964)
++++ gio/gfile.override	(working copy)
+@@ -196,7 +196,7 @@
+         return NULL;
+ 
+     if (ret)
+-        return Py_BuildValue("(sks)", contents, lenght, etag_out);
++        return Py_BuildValue("(s#ks)", contents, length, length, etag_out);
+     else {
+         Py_INCREF(Py_None);
+         return Py_None;
+@@ -270,7 +270,7 @@
+         return NULL;
+ 
+     if (ret)
+-        return Py_BuildValue("(sks)", contents, lenght, etag_out);
++        return Py_BuildValue("(s#ks)", contents, length, length, etag_out);
+     else {
+         Py_INCREF(Py_None);
+         return Py_None;
diff --git a/pygobject2.spec b/pygobject2.spec
index e719237..f776b70 100644
--- a/pygobject2.spec
+++ b/pygobject2.spec
@@ -8,7 +8,7 @@
 
 Name: pygobject2
 Version: 2.15.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -20,6 +20,8 @@ Source: pygobject-%{version}.tar.bz2
 
 # RH bug #544946
 Patch0: pygobject-2.15.2-threads-init.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=551059
+Patch1: pygobject-gio-load-contents.patch
 
 ### Build Dependencies ###
 
@@ -62,6 +64,7 @@ This package contains documentation files for %{name}.
 %prep
 %setup -q -n pygobject-%{version}
 %patch0 -p1 -b .threads-init
+%patch1 -p0 -b .load-contents
 
 %build
 %configure --enable-thread
@@ -116,6 +119,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Tue Oct 21 2008 - Bastien Nocera <bnocera@redhat.com> - 2.15.4-2.fc10
+- Add 2-liner fixing the load_contents functions not working appropriately
+
 * Wed Sep 03 2008 Matthew Barnes <mbarnes@redhat.com> - 2.15.4-1.fc10
 - Update to 2.15.4