- workaround make 3.82 issue in python/Makefile

This commit is contained in:
Dan Horák 2010-12-23 14:39:42 +01:00
parent 9fc8245f2b
commit cdb158ce7a
2 changed files with 28 additions and 1 deletions

View File

@ -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 \

View File

@ -5,13 +5,14 @@
Name: gupnp-igd Name: gupnp-igd
Version: 0.1.7 Version: 0.1.7
Release: 2%{?dist} Release: 3%{?dist}
Summary: Library to handle UPnP IGD port mapping Summary: Library to handle UPnP IGD port mapping
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
URL: http://www.gupnp.org/ URL: http://www.gupnp.org/
Source0: http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= %{glib2_ver} BuildRequires: glib2-devel >= %{glib2_ver}
@ -48,6 +49,7 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .make
%build %build
@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Dec 23 2010 Dan Horák <dan[at]danny.cz> - 0.1.7-3
- workaround make 3.82 issue in python/Makefile
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.1.7-2 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild