From b224025f60b18861174f1fa4665f493ebc2f49acd2d178fcbf19752fa68a286b Mon Sep 17 00:00:00 2001
From: Berthold Gunreben <azouhr@opensuse.org>
Date: Tue, 23 Aug 2011 08:42:47 +0000
Subject: [PATCH] Accepting request 79492 from devel:languages:python

Do not distribute the gtk2 parts here... fixes the remaining file conflict with python-gobject2"
 (forwarded request 79491 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/79492
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-gobject?expand=0&rev=12
---
 python-gobject.changes  | 6 ++++++
 python-gobject.spec     | 4 ++--
 python3-gobject.changes | 6 ++++++
 python3-gobject.spec    | 6 +++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/python-gobject.changes b/python-gobject.changes
index e187802..9c38cfc 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 22 12:41:59 UTC 2011 - dimstar@opensuse.org
+
+- Do not package gtk-2.0 subfolder. python-gobject2 provides that.
+  python-gobject 3.0 is targetting GTK+ 3.0. See also bgo#657054.
+
 -------------------------------------------------------------------
 Thu Aug 18 23:07:58 CEST 2011 - dimstar@opensuse.org
 
diff --git a/python-gobject.spec b/python-gobject.spec
index 1db350a..e8bd70e 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -110,6 +110,8 @@ make %{?jobs:-j%jobs} V=1
 %makeinstall
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 rm examples/Makefile*
+# Remove gtk-2.0 folder. It is still shipped in python-gobject2, and pygobject3 relies on gtk3
+rm -rf %{buildroot}%{local_py_sitedir}/gtk-2.0
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -122,9 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS NEWS README ChangeLog examples
-%dir %{local_py_sitedir}/gtk-2.0
 %{local_py_sitedir}/gi/
-%{local_py_sitedir}/gtk-2.0/dsextras.py*
 # Live in cairo subpackage
 %exclude %{local_py_sitedir}/gi/_gi_cairo.so
 
diff --git a/python3-gobject.changes b/python3-gobject.changes
index e187802..9c38cfc 100644
--- a/python3-gobject.changes
+++ b/python3-gobject.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 22 12:41:59 UTC 2011 - dimstar@opensuse.org
+
+- Do not package gtk-2.0 subfolder. python-gobject2 provides that.
+  python-gobject 3.0 is targetting GTK+ 3.0. See also bgo#657054.
+
 -------------------------------------------------------------------
 Thu Aug 18 23:07:58 CEST 2011 - dimstar@opensuse.org
 
diff --git a/python3-gobject.spec b/python3-gobject.spec
index 002fb34..92fa883 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python3-gobject
+# spec file for package python-gobject
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -110,6 +110,8 @@ make %{?jobs:-j%jobs} V=1
 %makeinstall
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 rm examples/Makefile*
+# Remove gtk-2.0 folder. It is still shipped in python-gobject2, and pygobject3 relies on gtk3
+rm -rf %{buildroot}%{local_py_sitedir}/gtk-2.0
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -122,9 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS NEWS README ChangeLog examples
-%dir %{local_py_sitedir}/gtk-2.0
 %{local_py_sitedir}/gi/
-%{local_py_sitedir}/gtk-2.0/dsextras.py*
 # Live in cairo subpackage
 %exclude %{local_py_sitedir}/gi/_gi_cairo.so