From d7243a2bed20cca7c57f941c6dd7f57a254268d3 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Fri, 13 Apr 2018 08:26:08 +0200
Subject: [PATCH] Update to current bugfix

---
 .gitignore   |  2 +-
 libupnp.spec | 39 ++++++++++++++++++++-------------------
 sources      |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e7c4ad..91dda42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libupnp-1.6.21.tar.bz2
+libupnp-*.tar.bz2
diff --git a/libupnp.spec b/libupnp.spec
index 4f277b2..3242eba 100644
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -1,14 +1,11 @@
-Version: 1.6.21
+Version: 1.6.25
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: BSD
-Group: System Environment/Libraries
-URL: http://www.libupnp.org/
-Source: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
+URL: https://sourceforge.net/projects/pupnp
+Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
 
-%define docdeveldir %{_docdir}/%{name}-devel-%{version}
-%define docdir %{_docdir}/%{name}-%{version}
 
 %description
 The Universal Plug and Play (UPnP) SDK for Linux provides 
@@ -16,9 +13,8 @@ support for building UPnP-compliant control points, devices,
 and bridges on Linux.
 
 %package devel
-Group: Development/Libraries
 Summary: Include files needed for development with libupnp
-Requires: libupnp = %{version}-%{release}
+Requires: libupnp%{?_isa} = %{version}-%{release}
 
 %description devel
 The libupnp-devel package contains the files necessary for development with
@@ -29,28 +25,28 @@ the UPnP SDK libraries.
 
 %build
 %configure --enable-static=no --enable-ipv6
-make %{?_smp_mflags}
+
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+%make_build
 
 %install
-test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 %{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la}
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE THANKS
+%license LICENSE
+%doc THANKS
 %{_libdir}/libixml.so.2*
 %{_libdir}/libthreadutil.so.6*
 %{_libdir}/libupnp.so.6*
 
 %files devel
-%defattr(0644,root,root,0755)
-#doc _devel_docs/*
 %{_includedir}/upnp/
 %{_libdir}/libixml.so
 %{_libdir}/libthreadutil.so
@@ -58,6 +54,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libupnp.pc
 
 %changelog
+* Fri Apr 13 2018 Nicolas Chauvet <kwizart@gmail.com> - 1.6.25-1
+- Update to 1.6.25
+- Spec file clean-up
+- Avoid rpath
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.21-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 1debd07..56a85e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libupnp-1.6.21.tar.bz2) = 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
+SHA512 (libupnp-1.6.25.tar.bz2) = c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f