rpms/pygobject2/devel pygobject-gio-load-contents.patch, NONE, 1.1 pygobject2.spec, 1.41, 1.42

[Bastien Nocera]

Author: hadess

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

Modified Files:
	pygobject2.spec 
Added Files:
	pygobject-gio-load-contents.patch 
Log Message:
* Tue Oct 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.15.4-2.fc10
- Add 2-liner fixing the load_contents functions not working appropriately


pygobject-gio-load-contents.patch:

--- NEW FILE pygobject-gio-load-contents.patch ---
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;


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pygobject2.spec	3 Sep 2008 11:17:42 -0000	1.41
+++ pygobject2.spec	21 Oct 2008 18:20:35 -0000	1.42
@@ -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 @@
 
 # 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 @@
 %prep
 %setup -q -n pygobject-%{version}
 %patch0 -p1 -b .threads-init
+%patch1 -p0 -b .load-contents
 
 %build
 %configure --enable-thread
@@ -116,6 +119,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Tue Oct 21 2008 - Bastien Nocera <bnocera at 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 at redhat.com> - 2.15.4-1.fc10
 - Update to 2.15.4