From 16ae21d74bd1e1f8f38156a566539d1cf41ca3f3abfae28fe7717b0d33aa6a98 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Thu, 29 Nov 2018 09:08:24 +0000
Subject: [PATCH] Accepting request 652542 from home:plater

Split off libixml10 and renamed libupnp6 to it's correct name libupnp13. Major version 6 was last seen long ago.

OBS-URL: https://build.opensuse.org/request/show/652542
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libupnp?expand=0&rev=26
---
 baselibs.conf   |  3 ++-
 libupnp.changes |  7 +++++++
 libupnp.spec    | 47 +++++++++++++++++++++++++++++++----------------
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index f351018..9a68fd5 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,2 @@
-libupnp6
+libupnp13
+libixml10
diff --git a/libupnp.changes b/libupnp.changes
index aff60f5..373ecac 100644
--- a/libupnp.changes
+++ b/libupnp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 28 10:53:06 UTC 2018 - davejplater@gmail.com
+
+- Split off libixml10 and renamed libupnp6 to it's correct name
+  libupnp13. Major version 6 was last seen long ago.
+- libthreadutil was merged with libupnp in version 1.8.1
+
 -------------------------------------------------------------------
 Thu Nov 15 19:13:44 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/libupnp.spec b/libupnp.spec
index 2073fbd..cd33fca 100644
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -13,11 +13,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
-%define lname libupnp6
+%define pnpver 13
+%define ixmlver 10
 Name:           libupnp
 Version:        1.8.4
 Release:        0
@@ -37,25 +38,32 @@ The portable Universal Plug and Play (UPnP) SDK provides support for building
 UPnP-compliant control points, devices, and bridges on several operating
 systems.
 
-%package -n %{lname}
+%package -n %{name}%{pnpver}
 Summary:        Portable Universal Plug and Play (UPnP) SDK
 Group:          System/Libraries
-Provides:       libixml2 = %{version}-%{release}
-Obsoletes:      libixml2 < %{version}
-Provides:       libthreadutil6 = %{version}-%{release}
-Obsoletes:      libthreadutil6 < %{version}
 
-%description -n %{lname}
+%description -n %{name}%{pnpver}
 The portable Universal Plug and Play (UPnP) SDK provides support for building
 UPnP-compliant control points, devices, and bridges on several operating
 systems
 
-%package -n libupnp-devel
+%package -n libixml%{ixmlver}
+Summary:        Portable Universal Plug and Play (UPnP) SDK
+Group:          System/Libraries
+
+%description -n libixml%{ixmlver}
+The portable Universal Plug and Play (UPnP) SDK provides support for building
+UPnP-compliant control points, devices, and bridges on several operating
+systems
+
+%package devel
 Summary:        Portable Universal Plug and Play (UPnP) SDK
 Group:          Development/Libraries/C and C++
-Requires:       %{lname} = %{version}
+Provides:       libixml-devel = %{version}
+Requires:       %{name}%{pnpver} = %{version}
+Requires:       libixml%{ixmlver} = %{version}
 
-%description -n libupnp-devel
+%description devel
 The portable Universal Plug and Play (UPnP) SDK provides support for building
 UPnP-compliant control points, devices, and bridges on several operating
 systems.
@@ -80,14 +88,21 @@ make %{?_smp_mflags}
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -p /sbin/ldconfig -n %{lname}
-%postun -p /sbin/ldconfig -n %{lname}
+%post -p /sbin/ldconfig -n %{name}%{pnpver}
+%postun -p /sbin/ldconfig -n %{name}%{pnpver}
 
-%files -n %{lname}
+%post -p /sbin/ldconfig -n libixml%{ixmlver}
+%postun -p /sbin/ldconfig -n libixml%{ixmlver}
+
+%files -n %{name}%{pnpver}
 %doc ChangeLog
 %license COPYING
-%{_libdir}/libixml.so.*
-%{_libdir}/libupnp.so.*
+%{_libdir}/libupnp.so.%{pnpver}*
+
+%files -n libixml%{ixmlver}
+%doc ChangeLog
+%license COPYING
+%{_libdir}/libixml.so.%{ixmlver}*
 
 %files -n libupnp-devel
 %{_libdir}/pkgconfig/libupnp.pc