diff --git a/.cvsignore b/.cvsignore index 2cbfc26..6dc3894 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pygobject-2.16.1.tar.bz2 +pygobject-2.17.0.tar.bz2 diff --git a/pygobject2-2.16.1-fix-classic-class-crash.patch b/pygobject2-2.16.1-fix-classic-class-crash.patch deleted file mode 100644 index 3dedbc1..0000000 --- a/pygobject2-2.16.1-fix-classic-class-crash.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up pygobject-2.16.1/gobject/gobjectmodule.c.fix-classic-class-crash pygobject-2.16.1/gobject/gobjectmodule.c ---- pygobject-2.16.1/gobject/gobjectmodule.c.fix-classic-class-crash 2009-02-20 16:48:29.000000000 -0500 -+++ pygobject-2.16.1/gobject/gobjectmodule.c 2009-04-22 16:23:21.000000000 -0400 -@@ -1079,16 +1079,20 @@ pyg_type_add_interfaces(PyTypeObject *cl - - for (i = 0; i < PyTuple_GET_SIZE(bases); ++i) { - guint k; -- PyTypeObject *base = (PyTypeObject *) PyTuple_GET_ITEM(bases, i); -+ PyObject *base = PyTuple_GET_ITEM(bases, i); - GType itype; - gboolean is_new = TRUE; - const GInterfaceInfo *iinfo; - GInterfaceInfo iinfo_copy; - -- if (!PyType_IsSubtype(base, &PyGInterface_Type)) -+ /* 'base' can also be a PyClassObject, see bug #566571. */ -+ if (!PyType_Check(base)) - continue; - -- itype = pyg_type_from_object((PyObject *) base); -+ if (!PyType_IsSubtype((PyTypeObject*) base, &PyGInterface_Type)) -+ continue; -+ -+ itype = pyg_type_from_object(base); - - /* Happens for _implementations_ of an interface. */ - if (!G_TYPE_IS_INTERFACE(itype)) -@@ -1109,7 +1113,7 @@ pyg_type_add_interfaces(PyTypeObject *cl - gchar *error; - error = g_strdup_printf("Interface type %s " - "has no Python implementation support", -- base->tp_name); -+ ((PyTypeObject *) base)->tp_name); - PyErr_Warn(PyExc_RuntimeWarning, error); - g_free(error); - continue; diff --git a/pygobject2.spec b/pygobject2.spec index d0158f7..1f955f8 100644 --- a/pygobject2.spec +++ b/pygobject2.spec @@ -1,6 +1,6 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Last updated for version 2.16.0 +# Last updated for version 2.17.0 %define glib2_version 2.16.0 %define python2_version 2.3.5 @@ -13,8 +13,8 @@ ### Abstract ### Name: pygobject2 -Version: 2.16.1 -Release: 4%{?dist} +Version: 2.17.0 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GObject @@ -22,11 +22,6 @@ URL: http://www.pygtk.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: pygobject-%{version}.tar.bz2 -### Patches ### - -# GNOME bug #566571 -Patch1: pygobject2-2.16.1-fix-classic-class-crash.patch - ### Build Dependencies ### BuildRequires: automake @@ -70,7 +65,6 @@ This package contains documentation files for %{name}. %prep %setup -q -n pygobject-%{version} -%patch1 -p1 -b .fix-classic-class-crash %build %configure --enable-thread @@ -125,6 +119,10 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/pygobject/xsl %changelog +* Thu Apr 30 2009 Matthew Barnes - 2.17.1-1.fc12 +- Update to 2.17.0 +- Remove patch for GNOME bug #566571 (fixed upstream). + * Wed Apr 22 2009 Matthew Barnes - 2.16.1-4.fc11 - Add patch for GNOME bug #566571 (classic vs new-style inheritance crash). diff --git a/sources b/sources index a342abd..3c14ab0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e26f2572e6b72dbd2591677055f8d30 pygobject-2.16.1.tar.bz2 +0ff7f166cb6b41b89ddf2d7e156e6360 pygobject-2.17.0.tar.bz2