From 10b946bbfbe93ca3ce0c88255e441d7e3df0cb09 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 5 Jan 2009 02:44:25 +0000 Subject: [PATCH] - Update to 2.16.0 - Remove patch for RH bug #457502 (fixed upstream). - Remove patch for GNOME bug #551059 and #551212 (fixed upstream). --- .cvsignore | 2 +- pygobject-2.15.2-threads-init.patch | 13 ------- pygobject-gio-load-contents.patch | 60 ----------------------------- pygobject2.spec | 21 +++++----- sources | 2 +- 5 files changed, 11 insertions(+), 87 deletions(-) delete mode 100644 pygobject-2.15.2-threads-init.patch delete mode 100644 pygobject-gio-load-contents.patch diff --git a/.cvsignore b/.cvsignore index 3b63a03..247cf3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pygobject-2.15.4.tar.bz2 +pygobject-2.16.0.tar.bz2 diff --git a/pygobject-2.15.2-threads-init.patch b/pygobject-2.15.2-threads-init.patch deleted file mode 100644 index dfaa21d..0000000 --- a/pygobject-2.15.2-threads-init.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up pygobject-2.15.3/gobject/gobjectmodule.c.threads-init pygobject-2.15.3/gobject/gobjectmodule.c ---- pygobject-2.15.3/gobject/gobjectmodule.c.threads-init 2008-08-31 17:11:51.000000000 -0400 -+++ pygobject-2.15.3/gobject/gobjectmodule.c 2008-08-31 20:33:54.000000000 -0400 -@@ -1809,6 +1809,9 @@ pygobject_enable_threads(void) - { - if (!pyglib_enable_threads()) - return -1; -+ -+ pygobject_api_functions.threads_enabled = TRUE; -+ - return 0; - } - diff --git a/pygobject-gio-load-contents.patch b/pygobject-gio-load-contents.patch deleted file mode 100644 index 1b5d800..0000000 --- a/pygobject-gio-load-contents.patch +++ /dev/null @@ -1,60 +0,0 @@ -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; ---- gio/gfile.override 2008/09/07 01:05:15 965 -+++ gio/gfile.override 2008/09/07 14:46:42 966 -@@ -176,7 +176,7 @@ - GCancellable *cancellable; - PyGObject *pycancellable = NULL; - gchar *contents, *etag_out; -- gsize lenght; -+ gsize length; - GError *error = NULL; - gboolean ret; - -@@ -190,7 +190,7 @@ - return NULL; - - ret = g_file_load_contents(G_FILE(self->obj), cancellable, -- &contents, &lenght, &etag_out, &error); -+ &contents, &length, &etag_out, &error); - - if (pyg_error_check(&error)) - return NULL; -@@ -251,7 +251,7 @@ - static char *kwlist[] = { "res", NULL }; - PyGObject *res; - gchar *contents, *etag_out; -- gsize lenght; -+ gsize length; - GError *error = NULL; - gboolean ret; - -@@ -264,7 +264,7 @@ - - ret = g_file_load_contents_finish(G_FILE(self->obj), - G_ASYNC_RESULT(res->obj), &contents, -- &lenght, &etag_out, &error); -+ &length, &etag_out, &error); - - if (pyg_error_check(&error)) - return NULL; diff --git a/pygobject2.spec b/pygobject2.spec index ff01ba2..fe0495f 100644 --- a/pygobject2.spec +++ b/pygobject2.spec @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for version 2.15.1 +# Last updated for version 2.16.0 %define glib2_version 2.16.0 %define python2_version 2.3.5 ### Abstract ### Name: pygobject2 -Version: 2.15.4 -Release: 4%{?dist} +Version: 2.16.0 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GObject @@ -18,12 +18,6 @@ Source: pygobject-%{version}.tar.bz2 ### Patches ### -# RH bug #544946 -Patch0: pygobject-2.15.2-threads-init.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=551059 -# http://bugzilla.gnome.org/show_bug.cgi?id=551212 -Patch1: pygobject-gio-load-contents.patch - ### Build Dependencies ### BuildRequires: automake @@ -64,8 +58,6 @@ 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 @@ -120,6 +112,11 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/pygobject/xsl %changelog +* Sun Jan 4 2009 - Matthew Barnes - 2.16.0-1.fc11 +- Update to 2.16.0 +- Remove patch for RH bug #457502 (fixed upstream). +- Remove patch for GNOME bug #551059 and #551212 (fixed upstream). + * Sat Nov 29 2008 - Ignacio Vazquez-Abrams - 2.15.4-4 - Rebuild for Python 2.6 @@ -139,7 +136,7 @@ rm -fr $RPM_BUILD_ROOT - Modify thread initialization patch to fix RH bug #458522. * Thu Aug 07 2008 Matthew Barnes - 2.15.2-2.fc10 -- Add patch for RH bug #544946 (error on gtk.gdk.threads_init). +- Add patch for RH bug #457502 (error on gtk.gdk.threads_init). * Sat Jul 26 2008 Matthew Barnes - 2.15.2-1.fc10 - Update to 2.15.2 diff --git a/sources b/sources index 0c83ca4..5a7e5a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df59affe5b8fd7148506c3473d479868 pygobject-2.15.4.tar.bz2 +431e7d4632163b93d1ee43cd071a389c pygobject-2.16.0.tar.bz2