From a781b5c13542ab5530c8c07d8b839fd578c3100e Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Thu, 30 Sep 2010 15:59:38 -0400 Subject: [PATCH] - Edit PyCapsule patch to only use PyCapsule in Python 3.x since this effects header files which require other modules to be recompiled. There is actually discussion upstream to undeprecate it for the 2.x series --- pygobject-pycapsule.patch | 6 +++--- pygobject2.spec | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pygobject-pycapsule.patch b/pygobject-pycapsule.patch index ce4ac48..e3114e3 100644 --- a/pygobject-pycapsule.patch +++ b/pygobject-pycapsule.patch @@ -20,7 +20,7 @@ index d1eaf05..551bb6f 100644 return 1; } - -+#if PY_VERSION_HEX >= 0x02070000 ++#if PY_VERSION_HEX >= 0x03000000 + PyGI_API = (struct PyGI_API*) PyCapsule_Import("gi._API", FALSE); +#else PyGI_API = (struct PyGI_API*) PyCObject_Import("gi", "_API"); @@ -59,7 +59,7 @@ index bb7bcad..222fc8c 100644 #endif +/* PyCObject superceded by PyCapsule on Python >= 2.7 */ -+#if PY_VERSION_HEX >= 0x02070000 ++#if PY_VERSION_HEX >= 0x03000000 +# define PYGLIB_PyCapsule_Check PyCapsule_CheckExact +# define PYGLIB_PyCapsule_New(ptr, typename) \ + PyCapsule_New(ptr, typename, NULL) @@ -138,7 +138,7 @@ index e75c890..c803634 100644 } cobject = PyObject_GetAttrString(gobject, "_PyGObject_API"); -+#if PY_VERSION_HEX >= 0x02070000 ++#if PY_VERSION_HEX >= 0x03000000 + if (cobject && PyCapsule_CheckExact(cobject)) + _PyGObject_API = (struct _PyGObject_Functions *) PyCapsule_GetPointer(cobject, "gobject._PyGObject_API"); + diff --git a/pygobject2.spec b/pygobject2.spec index 49b56dd..f292fb9 100644 --- a/pygobject2.spec +++ b/pygobject2.spec @@ -12,7 +12,7 @@ Name: pygobject2 Version: 2.26.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python 2 bindings for GObject @@ -183,6 +183,12 @@ rm examples/Makefile* %endif # with_python3 %changelog +* Thu Sep 30 2010 John (J5) Palmieri - 2.26.0-4 +- Edit PyCapsule patch to only use PyCapsule in Python 3.x + since this effects header files which require other modules to + be recompiled. There is actually discussion upstream to undeprecate it + for the 2.x series + * Tue Sep 28 2010 John (J5) Palmieri - 2.26.0-3 - add patch to work with PyCapsule since PyCObject is removed from Python 3.2 which we ship in rawhide