From c4adbbd121aae94d163d9abff038e7ae627865651a7633a254f0ca82052ed45d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 12 Sep 2013 09:09:27 +0000
Subject: [PATCH] fixup

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=12
---
 python-gobject.changes  |  8 ++++++++
 python-gobject.spec     | 22 +++-------------------
 python3-gobject.changes |  8 ++++++++
 python3-gobject.spec    | 22 +++-------------------
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/python-gobject.changes b/python-gobject.changes
index 58cfe8d..0bb7cea 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 12 09:04:15 UTC 2013 - dimstar@opensuse.org
+
+- Drop pygtkcompat subpackage: the compatibility layer is no longer
+  used and causes adverse side-effects (like pulling in Gtk2,
+  which is not corectly introspectable, causing all kind of other
+  weird issues).
+
 -------------------------------------------------------------------
 Mon Sep  2 13:34:14 UTC 2013 - dimstar@opensuse.org
 
diff --git a/python-gobject.spec b/python-gobject.spec
index c87d5ff..5aeb663 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -76,18 +76,6 @@ GLib's GObjects.
 
 This package contains the Python Cairo bindings for GObject.
 
-%package pygtkcompat
-Summary:        Python bindings for GObject -- PyGTK Backwards Compatibility
-Group:          Development/Libraries/Python
-Requires:       %{name} = %{version}
-
-%description pygtkcompat
-Pygobjects is an extension module for python that gives you access to
-GLib's GObjects.
-
-This package contains a module providing backwards compatibility to
-pygtk.
-
 %package -n libpyglib-gi-2_0-python%{local_lib_ver}
 Summary:        Python Gobject Introspeciton binding
 Group:          System/Libraries
@@ -130,6 +118,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 # Those files are python-version agnostic... so it does not matter.
 rm -r %{buildroot}%{_includedir}/pygobject-3.0/pygobject.h
 rm %{buildroot}%{_libdir}/pkgconfig/pygobject-3.0.pc
+# Drop pygtkcompat layer.it's useless and we lack other stuff for it to work
+rm %{buildroot}%{local_py_sitedir}/gi/pygtkcompat.py
+rm -r {buildroot}%{local_py_sitedir}/pygtkcompat/
 %endif
 rm examples/Makefile*
 %fdupes $RPM_BUILD_ROOT
@@ -148,8 +139,6 @@ rm -rf $RPM_BUILD_ROOT
 %{local_py_sitedir}/*.egg-info
 # Lives in cairo subpackage
 %exclude %{local_py_sitedir}/gi/_gi_cairo*.so
-# Lives in pygtkcompat subpackage
-%exclude %{local_py_sitedir}/gi/pygtkcompat.py
 
 %files -n libpyglib-gi-2_0-python%{local_lib_ver}
 %defattr(-, root, root)
@@ -159,11 +148,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{local_py_sitedir}/gi/_gi_cairo*.so
 
-%files pygtkcompat
-%defattr(-,root,root)
-%{local_py_sitedir}/gi/pygtkcompat.py
-%{local_py_sitedir}/pygtkcompat/
-
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so
diff --git a/python3-gobject.changes b/python3-gobject.changes
index 58cfe8d..0bb7cea 100644
--- a/python3-gobject.changes
+++ b/python3-gobject.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 12 09:04:15 UTC 2013 - dimstar@opensuse.org
+
+- Drop pygtkcompat subpackage: the compatibility layer is no longer
+  used and causes adverse side-effects (like pulling in Gtk2,
+  which is not corectly introspectable, causing all kind of other
+  weird issues).
+
 -------------------------------------------------------------------
 Mon Sep  2 13:34:14 UTC 2013 - dimstar@opensuse.org
 
diff --git a/python3-gobject.spec b/python3-gobject.spec
index d6b7a91..cd3c566 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -76,18 +76,6 @@ GLib's GObjects.
 
 This package contains the Python Cairo bindings for GObject.
 
-%package pygtkcompat
-Summary:        Python bindings for GObject -- PyGTK Backwards Compatibility
-Group:          Development/Libraries/Python
-Requires:       %{name} = %{version}
-
-%description pygtkcompat
-Pygobjects is an extension module for python that gives you access to
-GLib's GObjects.
-
-This package contains a module providing backwards compatibility to
-pygtk.
-
 %package -n libpyglib-gi-2_0-python%{local_lib_ver}
 Summary:        Python Gobject Introspeciton binding
 Group:          System/Libraries
@@ -130,6 +118,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 # Those files are python-version agnostic... so it does not matter.
 rm -r %{buildroot}%{_includedir}/pygobject-3.0/pygobject.h
 rm %{buildroot}%{_libdir}/pkgconfig/pygobject-3.0.pc
+# Drop pygtkcompat layer.it's useless and we lack other stuff for it to work
+rm %{buildroot}%{local_py_sitedir}/gi/pygtkcompat.py
+rm -r {buildroot}%{local_py_sitedir}/pygtkcompat/
 %endif
 rm examples/Makefile*
 %fdupes $RPM_BUILD_ROOT
@@ -148,8 +139,6 @@ rm -rf $RPM_BUILD_ROOT
 %{local_py_sitedir}/*.egg-info
 # Lives in cairo subpackage
 %exclude %{local_py_sitedir}/gi/_gi_cairo*.so
-# Lives in pygtkcompat subpackage
-%exclude %{local_py_sitedir}/gi/pygtkcompat.py
 
 %files -n libpyglib-gi-2_0-python%{local_lib_ver}
 %defattr(-, root, root)
@@ -159,11 +148,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{local_py_sitedir}/gi/_gi_cairo*.so
 
-%files pygtkcompat
-%defattr(-,root,root)
-%{local_py_sitedir}/gi/pygtkcompat.py
-%{local_py_sitedir}/pygtkcompat/
-
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so