[python-gtkextra] Fix build with recent gtk+extra packages

[Miloslav Trmac]

commit 29ef89b8a6c7e98d6dc0f640ee3f8df18fdd16cf
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Fri Jul 15 19:12:52 2011 +0200

    Fix build with recent gtk+extra packages

 python-gtkextra-1.1.0-G_TYPE_ITEM_ENTRY.patch |   14 ++++++++++++++
 python-gtkextra.spec                          |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/python-gtkextra-1.1.0-G_TYPE_ITEM_ENTRY.patch b/python-gtkextra-1.1.0-G_TYPE_ITEM_ENTRY.patch
new file mode 100644
index 0000000..86e355b
--- /dev/null
+++ b/python-gtkextra-1.1.0-G_TYPE_ITEM_ENTRY.patch
@@ -0,0 +1,14 @@
+diff -ur python-gtkextra/gtkextra/gtkextra.override python-gtkextra-1.1.0/gtkextra/gtkextra.override
+--- python-gtkextra/gtkextra/gtkextra.override	2011-07-15 18:20:28.659473854 +0200
++++ python-gtkextra-1.1.0/gtkextra/gtkextra.override	2011-07-15 18:52:45.822162295 +0200
+@@ -28,6 +28,10 @@
+ #include <pygtk/pygtk.h>
+ #include <gtkextra/gtkextra.h>
+ #include <gtkextra/gtkextratypebuiltins.h>
++/* pygobject assumes that the cast macro for X_TYPE_Y is called X_Y. */
++#ifndef GTK_TYPE_ITEM_ENTRY
++#define GTK_TYPE_ITEM_ENTRY G_TYPE_ITEM_ENTRY
++#endif
+ 
+ static PyObject *pygtkextra_data_from_pyobject_callback = NULL;
+ static const gchar *const function_key = "pygtkextra::function";
diff --git a/python-gtkextra.spec b/python-gtkextra.spec
index 335c03b..9643d20 100644
--- a/python-gtkextra.spec
+++ b/python-gtkextra.spec
@@ -3,7 +3,7 @@
 Summary: Python bindings for gtkextra
 Name: python-gtkextra
 Version: 1.1.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 # FIXME: the license is not quite clear, using the most restrictive license
 # for this field.  See
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1941652&group_id=35371&atid=414148
@@ -17,6 +17,8 @@ Patch1: python-gtkextra-1.1.0-codegenmoved.patch
 Patch2: python-gtkextra-1.1.0-Makefile.patch
 # https://sourceforge.net/tracker/?func=detail&aid=3172768&group_id=35371&atid=414148
 Patch3: python-gtkextra-1.1.0-PyCObject.patch
+# https://sourceforge.net/tracker/?func=detail&aid=3368113&group_id=35371&atid=414148
+Patch4: python-gtkextra-1.1.0-G_TYPE_ITEM_ENTRY.patch
 BuildRequires: gtk+extra-devel, pygtk2-devel, python2-devel
 # For autoreconf
 BuildRequires: autoconf, automake, libtool
@@ -34,6 +36,7 @@ This package provides a Python interface to the GtkExtra2 widget set for GTK2.
 %patch1 -p1 -b .codegenmoved
 %patch2 -p1 -b .Makefile
 %patch3 -p1 -b .PyCObject
+%patch4 -p1 -b .G_TYPE_ITEM_ENTRY
 autoreconf -fi
 
 %build
@@ -58,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/gtkextra*.defs
 
 %changelog
+* Fri Jul 15 2011 Miloslav Trmač <mitr at redhat.com> - 1.1.0-17
+- Fix build with recent gtk+extra packages
+  Resolves: #715864
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild