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..14344ce 100644 --- a/libupnp.changes +++ b/libupnp.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Nov 29 19:32:02 UTC 2018 - Jan Engelhardt + +- Update descriptions. "Portable" is part of the proper noun, + and needs an uppercase P here. + +------------------------------------------------------------------- +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 diff --git a/libupnp.spec b/libupnp.spec index 2073fbd..213921a 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -17,11 +17,12 @@ # -%define lname libupnp6 +%define pnpver 13 +%define ixmlver 10 Name: libupnp Version: 1.8.4 Release: 0 -Summary: Portable Universal Plug and Play (UPnP) SDK +Summary: An implementation of Universal Plug and Play (UPnP) License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://github.com/mrjimenez/pupnp @@ -33,30 +34,35 @@ BuildRequires: libtool BuildRequires: pkgconfig %description -The portable Universal Plug and Play (UPnP) SDK provides support for building +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} -Summary: Portable Universal Plug and Play (UPnP) SDK +%package -n %{name}%{pnpver} +Summary: An implementation of Universal Plug and Play (UPnP) Group: System/Libraries -Provides: libixml2 = %{version}-%{release} -Obsoletes: libixml2 < %{version} -Provides: libthreadutil6 = %{version}-%{release} -Obsoletes: libthreadutil6 < %{version} -%description -n %{lname} -The portable Universal Plug and Play (UPnP) SDK provides support for building +%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 -Summary: Portable Universal Plug and Play (UPnP) SDK -Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +%package -n libixml%{ixmlver} +Summary: The Portable UPnP SDK's XML library +Group: System/Libraries -%description -n libupnp-devel -The portable Universal Plug and Play (UPnP) SDK provides support for building +%description -n libixml%{ixmlver} +A C XML parsing library originally created for the Intel UPnP SDK for Linux. + +%package devel +Summary: The Portable Universal Plug and Play (UPnP) SDK +Group: Development/Libraries/C and C++ +Provides: libixml-devel = %{version}-%{release} +Requires: %{name}%{pnpver} = %{version} +Requires: libixml%{ixmlver} = %{version} + +%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 +86,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