From 098925f4e4e94ed16b9277ce9830945830a38550b5efba2f2332d054561d4ed1 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 23 Dec 2011 15:21:25 +0000
Subject: [PATCH] Accepting request 98035 from
 home:vuntz:branches:GNOME:Factory

Split typelib subpackage

OBS-URL: https://build.opensuse.org/request/show/98035
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp-igd?expand=0&rev=23
---
 gupnp-igd.changes | 11 +++++++++++
 gupnp-igd.spec    | 43 ++++++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/gupnp-igd.changes b/gupnp-igd.changes
index 0bc3f4d..db3d42f 100644
--- a/gupnp-igd.changes
+++ b/gupnp-igd.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 23 10:40:40 UTC 2011 - vuntz@opensuse.org
+
+- Split typelib file into typelib-1_0-GUPnPIgd-1_0 subpackage.
+- Add typelib-1_0-GUPnPIgd-1_0 Requires to libgupnp-igd-devel
+  subpackage.
+- Rename python-gupnp-id subpackage to python-gupnp-igd: there was
+  a typo in the package name. Add appropriate Provides/Obsoletes.
+- Remove libgupnp-devel Requires from libgupnp-igd-devel
+  subpackage: it will automatically be added the pkgconfig() way.
+
 -------------------------------------------------------------------
 Tue Nov  8 10:10:50 UTC 2011 - dimstar@opensuse.org
 
diff --git a/gupnp-igd.spec b/gupnp-igd.spec
index beaf581..439c118 100644
--- a/gupnp-igd.spec
+++ b/gupnp-igd.spec
@@ -15,13 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           gupnp-igd
 Version:        0.2.1
-Release:        1
+Release:        0
+# FIXME: on version bump, change versioned Obsoletes in python subpackage: <= to < (was 0.2.1)
 Summary:        Library to handle UPnP IGD port mapping
-License:        LGPLv2.1+
+License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Url:            http://www.gupnp.org/
 Source:         http://gupnp.org/sites/all/files/sources/%{name}-%{version}.tar.gz
@@ -33,37 +32,48 @@ BuildRequires:  python-gobject2-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
+GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
 to have a very simple API.
 
 %package -n libgupnp-igd-1_0-4
-License:        LGPLv2.1+
 Summary:        Library to handle UPnP IGD port mapping
 Group:          Development/Libraries/C and C++
 
 %description -n libgupnp-igd-1_0-4
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
+GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
 to have a very simple API.
 
-%package -n python-gupnp-id
-License:        LGPLv2.1+
+%package -n typelib-1_0-GUPnPIgd-1_0
+Summary:        Library to handle UPnP IGD port mapping -- Introspection bindings
+Group:          Development/Libraries/C and C++
+
+%description -n typelib-1_0-GUPnPIgd-1_0
+GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
+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-3 = %{version}
+# Doh, we made a typo in the package name until 12.2 :/
+Provides:       python-gupnp-id = %{version}
+# FIXME: change <= to < once we have a new version (than 0.2.1)
+Obsoletes:      python-gupnp-id <= %{version}
 
-%description -n python-gupnp-id
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
+%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
-License:        LGPLv2.1+
 Summary:        Library to handle UPnP IGD port mapping - Development Files
 Group:          Development/Libraries/C and C++
 Requires:       libgupnp-igd-1_0-4 = %{version}
-Requires:       libgupnp-devel
+Requires:       typelib-1_0-GUPnPIgd-1_0 = %{version}
 
 %description -n libgupnp-igd-devel
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
+GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
 to have a very simple API.
 
 %prep
@@ -88,9 +98,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/*.so.*
+
+%files -n typelib-1_0-GUPnPIgd-1_0
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/GUPnPIgd-1.0.typelib
 
-%files -n python-gupnp-id
+%files -n python-gupnp-igd
 %defattr(-,root,root)
 %{python_sitearch}/gupnp/