Accepting request 559290 from home:adrianSuSE:home-assistant

version update, python3 build

OBS-URL: https://build.opensuse.org/request/show/559290
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-libnacl?expand=0&rev=33

libnacl-1.4.4-libsodium18.patch

@@ -1,13 +0,0 @@
-Index: libnacl-1.4.4/libnacl/__init__.py
-===================================================================
---- libnacl-1.4.4.orig/libnacl/__init__.py
-+++ libnacl-1.4.4/libnacl/__init__.py
-@@ -9,7 +9,7 @@ from libnacl.version import __version__
- import ctypes
- import sys
- 
--__SONAMES = (17, 13, 10, 5, 4)
-+__SONAMES = (18, 17, 13, 10, 5, 4)
- 
- 
- def _get_nacl():

libnacl-1.4.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2ee401a78dc693fcbc2051befcee2f76bb13ce75a933420646abfa47a39a6db
-size 30965

python-libnacl.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 22 10:33:56 UTC 2017 - adrian@suse.de
+
+- update to version 1.6.1 from github
+- drop obsolete patch libnacl-1.4.4-libsodium18.patch
+- enable python3 builds
+
 -------------------------------------------------------------------
 Wed Apr 13 17:36:30 UTC 2016 - zaitor@opensuse.org
 

python-libnacl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-libnacl
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,20 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-libnacl
-Version:        1.4.4
+Version:        1.6.1
 Release:        0
 Summary:        Python bindings for libsodium based on ctypes
 License:        Apache-2.0
 Group:          Development/Languages/Python
 Url:            https://github.com/saltstack/libnacl
-Source0:        https://pypi.python.org/packages/source/l/libnacl/libnacl-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE libnacl-1.4.4-libsodium18.patch find libsodium 1.0.8
-Patch0:         libnacl-1.4.4-libsodium18.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        https://github.com/saltstack/libnacl/archive/v%{version}.tar.gz
 
-BuildRequires:  python
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 # libnacl/__init__.py only looks for sonames 17, 13, 10, 5, 4
 # plus 18 with Patch0
 %if 0%{?suse_version} >= 1310 
@@ -38,12 +37,13 @@ BuildRequires:  pkgconfig(libsodium)
 %else
 BuildRequires:  libsodium-devel <= 1.0.8
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 # make sure we require the libsodium version we were built with
 # this is extracted from the requires_eq macro because we need the -a parameter to expand the wildcard in the package name.
 %(LC_ALL=C rpm -q -a --qf "Requires: %%{name}(%{__isa}) = %%{version}\n" 'libsodium*' | grep -v libsodium-devel | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
+%python_subpackages
+
 %description
 This library is used to gain direct access to the functions exposed by Daniel J. Bernstein's nacl library via libsodium.
 It has been constructed to maintain extensive documentation on how to use nacl as well as being completely portable. The file 
@@ -51,15 +51,15 @@ in libnacl/__init__.py can be pulled out and placed directly in any project to g
 
 %prep
 %setup -q -n libnacl-%{version}
-%patch0 -p1
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} --optimize=1
+%python_install
+%python_expand %fdupes -s %{buildroot}/%{$python_sitelib}
 
-%files
+%files %{python_files}
 %defattr(-,root,root)
 %{python_sitelib}/*
 

v1.6.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bde24d0a601464af4d3cc3117cf98b94046bfb01fe632f417a447b6899b11b3
+size 39789