From cdb158ce7a7b6321e0ef40092b1b024fc66ea22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 23 Dec 2010 14:39:42 +0100 Subject: [PATCH] - workaround make 3.82 issue in python/Makefile --- gupnp-igd-0.1.7-make.patch | 22 ++++++++++++++++++++++ gupnp-igd.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gupnp-igd-0.1.7-make.patch diff --git a/gupnp-igd-0.1.7-make.patch b/gupnp-igd-0.1.7-make.patch new file mode 100644 index 0000000..fb72002 --- /dev/null +++ b/gupnp-igd-0.1.7-make.patch @@ -0,0 +1,22 @@ +diff -up gupnp-igd-0.1.7/gtk-doc.make gupnp-igd-0.1.7/gtk-doc +diff -up gupnp-igd-0.1.7/python/Makefile.am.make gupnp-igd-0.1.7/python/Makefile.am +--- gupnp-igd-0.1.7/python/Makefile.am.make 2010-12-23 14:28:49.000000000 +0100 ++++ gupnp-igd-0.1.7/python/Makefile.am 2010-12-23 14:28:59.000000000 +0100 +@@ -1,5 +1,4 @@ + PYDEFS=`pkg-config --variable=defsdir pygobject-2.0` +-[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`] + + AM_CPPFLAGS = \ + -I. \ +diff -up gupnp-igd-0.1.7/python/Makefile.in.make gupnp-igd-0.1.7/python/Makefile.in +--- gupnp-igd-0.1.7/python/Makefile.in.make 2010-12-23 14:28:56.000000000 +0100 ++++ gupnp-igd-0.1.7/python/Makefile.in 2010-12-23 14:29:21.000000000 +0100 +@@ -640,8 +640,6 @@ uninstall-am: uninstall-pygupnpigdLTLIBR + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-pygupnpigdLTLIBRARIES uninstall-pygupnpigdPYTHON + +-[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`] +- + pygupnp-igd.c: $(srcdir)/pygupnp-igd.override $(srcdir)/pygupnp-igd.defs + $(PYCODEGEN) \ + --prefix igd \ diff --git a/gupnp-igd.spec b/gupnp-igd.spec index 9110b3b..9f49264 100644 --- a/gupnp-igd.spec +++ b/gupnp-igd.spec @@ -5,13 +5,14 @@ Name: gupnp-igd Version: 0.1.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to handle UPnP IGD port mapping Group: System Environment/Libraries License: LGPLv2+ URL: http://www.gupnp.org/ Source0: http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-0.1.7-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_ver} @@ -48,6 +49,7 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .make %build @@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 23 2010 Dan HorĂ¡k - 0.1.7-3 +- workaround make 3.82 issue in python/Makefile + * Wed Jul 21 2010 David Malcolm - 0.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild