From b16744094842009632428da8c9c85ffe40d86d81 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Jul 2010 13:39:18 -0400 Subject: [PATCH] * Fri Jul 30 2010 Toshio Kuratomi - 2.17.0-7 - Add upstream patch to fix pkgconfig dependencies --- ...-pygtk-2.0.pc-Should-require-gtk-2.0.patch | 25 +++++++++++++++++++ pygtk2.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-pygtk-2.0.pc-Should-require-gtk-2.0.patch diff --git a/0001-pygtk-2.0.pc-Should-require-gtk-2.0.patch b/0001-pygtk-2.0.pc-Should-require-gtk-2.0.patch new file mode 100644 index 0000000..a9eea34 --- /dev/null +++ b/0001-pygtk-2.0.pc-Should-require-gtk-2.0.patch @@ -0,0 +1,25 @@ +From a9e24426aae96e5968b95ef76aacf41d3153ddf7 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 30 Jul 2010 10:23:56 -0400 +Subject: [PATCH] [pygtk-2.0.pc] Should require gtk+-2.0 + +https://bugzilla.redhat.com/show_bug.cgi?id=618944 +--- + pygtk-2.0.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pygtk-2.0.pc.in b/pygtk-2.0.pc.in +index 0506e75..e277e80 100644 +--- a/pygtk-2.0.pc.in ++++ b/pygtk-2.0.pc.in +@@ -20,6 +20,6 @@ codegendir=${datadir}/pygobject/2.0/codegen + + Name: PyGTK + Description: Python bindings for GTK+ and related libraries +-Requires: pygobject-2.0 ++Requires: pygobject-2.0 gtk+-2.0 + Version: @VERSION@ + Cflags: -I${pygtkincludedir} @THREADING_CFLAGS@ +-- +1.7.2 + diff --git a/pygtk2.spec b/pygtk2.spec index 99f5652..3b6dae1 100644 --- a/pygtk2.spec +++ b/pygtk2.spec @@ -15,7 +15,7 @@ Name: pygtk2 Version: 2.17.0 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GTK+ @@ -31,6 +31,9 @@ Patch0: pygtk-nodisplay-exception.patch # https://bugzilla.gnome.org/show_bug.cgi?id=624834 Patch1: 0001-Remove-deprecated-sink-functions.patch +# http://git.gnome.org/browse/pygtk/commit/?id=a9e24426aae96e5968b95ef76aacf41d3153ddf7 +# RH bug: https://bugzilla.redhat.com/show_bug.cgi?id=618944 +Patch2: 0001-pygtk-2.0.pc-Should-require-gtk-2.0.patch ### Dependencies ### # Leave these requirements alone! RPM isn't smart enough @@ -102,6 +105,7 @@ This package contains documentation files for %{name}. %setup -q -n pygtk-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --enable-thread --enable-numpy @@ -163,6 +167,9 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/pygtk %changelog +* Fri Jul 30 2010 Toshio Kuratomi - 2.17.0-7 +- Add upstream patch to fix pkgconfig dependencies + * Wed Jul 21 2010 David Malcolm - 2.17.0-6 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild