From 7cf7c7f8c893a1319eadc3138b870a4f78f551de72573ec379ea041187d4dfdd Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 28 Feb 2017 21:41:32 +0000
Subject: [PATCH] Accepting request 460984 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/460984
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp-igd?expand=0&rev=38
---
 gupnp-igd.changes | 13 +++++++++++++
 gupnp-igd.spec    | 35 ++++++++---------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/gupnp-igd.changes b/gupnp-igd.changes
index 9722072..9842ffb 100644
--- a/gupnp-igd.changes
+++ b/gupnp-igd.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Feb 28 09:53:30 UTC 2017 - zaitor@opensuse.org
+
+- Drop pkgconfig(pygobject-2.0) and pkgconfig(pygtk-2.0)
+  BuildRequires: Follow upstream who have had python-bindings
+  disabled by default since version 0.2.3. pygobject-2.0 and
+  pygtk-2.0 are considered deprecated, and we want to minimize our
+  dependencies on these old bindings.
+- Following the above, drop no longer built sub-package
+  python-gupnp-igd, and obsolete it from the main library.
+- Run spec-cleaner, modernize spec, adds pkgconfig BuildRequires
+  and drops obsolete clean section.
+
 -------------------------------------------------------------------
 Fri Apr 15 22:29:27 UTC 2016 - mgorse@suse.com
 
diff --git a/gupnp-igd.spec b/gupnp-igd.spec
index e4a5e33..1c0fa98 100644
--- a/gupnp-igd.spec
+++ b/gupnp-igd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gupnp-igd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,7 @@ Group:          Development/Libraries/C and C++
 Url:            http://www.gupnp.org/
 Source:         http://download.gnome.org/sources/gupnp-igd/0.2/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0) >= 2.26
 BuildRequires:  pkgconfig(gobject-2.0) >= 2.26
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
@@ -32,8 +33,6 @@ BuildRequires:  pkgconfig(gssdp-1.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk-doc)
 BuildRequires:  pkgconfig(gupnp-1.0) >= 0.18
-BuildRequires:  pkgconfig(pygobject-2.0)
-BuildRequires:  pkgconfig(pygtk-2.0)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -42,7 +41,9 @@ to have a very simple API.
 
 %package -n libgupnp-igd-1_0-4
 Summary:        Library to handle UPnP IGD port mapping
+# Obsoletes may be removed when Leap 42.3 is out of support.
 Group:          Development/Libraries/C and C++
+Obsoletes:      python-gupnp-igd
 
 %description -n libgupnp-igd-1_0-4
 GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
@@ -58,18 +59,6 @@ to have a very simple API.
 
 This package provides the GObject Introspection bindings for GUPnP-IGD.
 
-%package -n python-gupnp-igd
-Summary:        Library to handle UPnP IGD port mapping - Python Bindings
-Group:          Development/Libraries/Python
-Requires:       libgupnp-igd-1_0-4 = %{version}
-# Doh, we made a typo in the package name until 12.2 :/
-Provides:       python-gupnp-id = %{version}
-Obsoletes:      python-gupnp-id < %{version}
-
-%description -n python-gupnp-igd
-GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
-to have a very simple API.
-
 %package -n libgupnp-igd-devel
 Summary:        Library to handle UPnP IGD port mapping - Development Files
 Group:          Development/Libraries/C and C++
@@ -84,19 +73,15 @@ to have a very simple API.
 %setup -q
 
 %build
-%configure --disable-static \
-    --enable-python
-%__make %{?_smp_mflags}
+%configure --disable-static
+
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%clean
-rm -rf %{buildroot}
-
 %post -n libgupnp-igd-1_0-4 -p /sbin/ldconfig
-
 %postun -n libgupnp-igd-1_0-4 -p /sbin/ldconfig
 
 %files -n libgupnp-igd-1_0-4
@@ -108,10 +93,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_libdir}/girepository-1.0/GUPnPIgd-1.0.typelib
 
-%files -n python-gupnp-igd
-%defattr(-,root,root)
-%{python_sitearch}/gupnp/
-
 %files -n libgupnp-igd-devel
 %defattr(-,root,root)
 %{_includedir}/%{name}-1.0