From 8e438834cbcfd56a8cb1bae6d959c167b82bcaf80e76b3562909c387bcf6825a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 13 Sep 2010 10:13:56 +0000 Subject: [PATCH] Accepting request 47905 from GNOME:Factory Copy from GNOME:Factory/gupnp-igd based on submit request 47905 from user vuntz OBS-URL: https://build.opensuse.org/request/show/47905 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gupnp-igd?expand=0&rev=9 --- gupnp-igd-make382.patch | 23 +++++++++++++++++++++++ gupnp-igd.changes | 7 +++++++ gupnp-igd.spec | 8 +++++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gupnp-igd-make382.patch diff --git a/gupnp-igd-make382.patch b/gupnp-igd-make382.patch new file mode 100644 index 0000000..b1ce6db --- /dev/null +++ b/gupnp-igd-make382.patch @@ -0,0 +1,23 @@ +From 0ba5417df63c60dbc46c24380a8872f716a9cb95 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sat, 11 Sep 2010 22:25:48 +0200 +Subject: [PATCH] Fix build with make 3.82. Make is not bash. + +--- + python/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index ee31665..0931b82 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -1,5 +1,5 @@ + PYDEFS=`pkg-config --variable=defsdir pygobject-2.0` +-[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`] ++PYDEFS ?= `pkg-config --variable=defsdir pygtk-2.0` + + AM_CPPFLAGS = \ + -I. \ +-- +1.7.1 + diff --git a/gupnp-igd.changes b/gupnp-igd.changes index 977d50a..2005c2a 100644 --- a/gupnp-igd.changes +++ b/gupnp-igd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 11 20:27:55 UTC 2010 - dimstar@opensuse.org + +- Add gupnp-igd-make382.patch: Fix build with make 3.82 +- Add autoreconf call in build section. +- Add gtk-doc BuildRequires. + ------------------------------------------------------------------- Mon Jun 21 12:48:54 CEST 2010 - dimstar@opensuse.org diff --git a/gupnp-igd.spec b/gupnp-igd.spec index 5eb1e68..1d7c842 100644 --- a/gupnp-igd.spec +++ b/gupnp-igd.spec @@ -19,12 +19,15 @@ Name: gupnp-igd Version: 0.1.7 -Release: 1 +Release: 2 Summary: Library to handle UPnP IGD port mapping License: LGPLv2.1+ Group: Development/Libraries/C and C++ Url: http://www.gupnp.org/ Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gupnp-igd-make382.patch dimstar@opensuse.org -- Fix build with make 3.82. Requires autoreconf and gtk-doc BuildRequires. +Patch0: gupnp-igd-make382.patch +BuildRequires: gtk-doc BuildRequires: libgupnp-devel BuildRequires: python-devel BuildRequires: python-gobject2-devel @@ -66,8 +69,11 @@ to have a very simple API. %prep %setup -q +%patch0 -p1 %build +# Autoreconf is needed for patch0 -- Fix build with make 3.82 +autoreconf %configure --disable-static %__make %{?jobs:-j%jobs}