Accepting request 620181 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/620181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/miniupnpc?expand=0&rev=17

miniupnpc-kernelversion.patch

@@ -0,0 +1,15 @@
+Index: miniupnpc-2.1/updateminiupnpcstrings.sh
+===================================================================
+--- miniupnpc-2.1.orig/updateminiupnpcstrings.sh
++++ miniupnpc-2.1/updateminiupnpcstrings.sh
+@@ -8,8 +8,8 @@ TMPFILE=miniupnpcstrings.h.tmp
+ TEMPLATE_FILE=${FILE}.in
+ 
+ # detecting the OS name and version
+-OS_NAME=`uname -s`
+-OS_VERSION=`uname -r`
++OS_NAME=openSUSE
++OS_VERSION=Distribution
+ if [ -f /etc/debian_version ]; then
+ 	OS_NAME=Debian
+ 	OS_VERSION=`cat /etc/debian_version`

miniupnpc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 29 12:35:27 UTC 2018 - tchvatal@suse.com
+
+- Fix reproducability by not coding in kernel version:
+  * miniupnpc-kernelversion.patch
+- Fix build with python3 only present in system
+
 -------------------------------------------------------------------
 Sat May 26 10:52:25 UTC 2018 - joop.boonen@opensuse.org
 

miniupnpc.spec

@@ -18,15 +18,18 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define soname 17
+%bcond_without python2
 Name:           miniupnpc
 Version:        2.1
 Release:        0
 Summary:        Universal Plug'n'Play (UPnP) Client
 License:        BSD-3-Clause
 Group:          Productivity/Networking/Other
-Url:            http://miniupnp.free.fr/
+URL:            http://miniupnp.free.fr/
 Source:         http://miniupnp.free.fr/files/miniupnpc-%{version}.tar.gz
 Source99:       baselibs.conf
+# PATCH-FIX-SUSE: do not hardcode kernel version in headers
+Patch0:         miniupnpc-kernelversion.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -58,7 +61,6 @@ Device (IGD) specifications.
 Summary:        Universal Plug'n'Play (UPnP) Client Module for Python
 Group:          Development/Libraries/Python
 Requires:       libminiupnpc%{soname} = %{version}-%{release}
-%py_requires
 
 %description -n python2-miniupnpc
 The MiniUPnP project offers software which supports the UPnP Internet Gateway
@@ -68,7 +70,6 @@ Device (IGD) specifications.
 Summary:        Universal Plug'n'Play (UPnP) Client Module for Python
 Group:          Development/Libraries/Python
 Requires:       libminiupnpc%{soname} = %{version}-%{release}
-%py_requires
 
 %description -n python3-miniupnpc
 The MiniUPnP project offers software which supports the UPnP Internet Gateway
@@ -76,6 +77,7 @@ Device (IGD) specifications.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CFLAGS="%{optflags}"
@@ -102,7 +104,7 @@ chmod -x %{buildroot}%{_mandir}/man3/miniupnpc.3.gz
 %files
 %{_bindir}/upnpc
 %{_bindir}/external-ip
-%{_mandir}/man3/miniupnpc.3%{ext_man}
+%{_mandir}/man3/miniupnpc.3%{?ext_man}
 
 %files -n libminiupnpc%{soname}
 %doc Changelog.txt README
@@ -114,14 +116,14 @@ chmod -x %{buildroot}%{_mandir}/man3/miniupnpc.3.gz
 %{_libdir}/libminiupnpc.so
 %{_libdir}/pkgconfig/miniupnpc.pc
 
+%if %{with python2}
 %files -n python2-miniupnpc
-%defattr(-,root,root,-)
 %doc Changelog.txt README
 %license LICENSE
 %{python2_sitearch}/
+%endif
 
 %files -n python3-miniupnpc
-%defattr(-,root,root,-)
 %doc Changelog.txt README
 %license LICENSE
 %{python3_sitearch}/