Accepting request 353634 from home:dmacvicar:branches:devel:languages:python

- Add libnacl-1.4.4-libsodium18.patch to find libsodium 1.0.8
- Fix BuildRequires to avoid building with a newer version
  of libsodium than 1.0.8

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

libnacl-1.4.4-libsodium18.patch

@@ -0,0 +1,13 @@
+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():

python-libnacl.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 14 09:31:03 UTC 2016 - dmacvicar@suse.de
+
+- Add libnacl-1.4.4-libsodium18.patch to find libsodium 1.0.8
+- Fix BuildRequires to avoid building with a newer version
+  of libsodium than 1.0.8
+
 -------------------------------------------------------------------
 Mon Jan  4 20:13:15 UTC 2016 - aboe76@gmail.com
 

python-libnacl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-libnacl
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -15,26 +15,30 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           python-libnacl
 Version:        1.4.4
 Release:        0
-License:        Apache-2.0
 Summary:        Python bindings for libsodium based on ctypes
-Url:            https://github.com/saltstack/libnacl
+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
-BuildRoot:      %{_tmppath}/libnacl-%{version}-build
+# 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
 
 BuildRequires:  python
-BuildRequires:  python-setuptools
 BuildRequires:  python-devel
-BuildRequires:  libsodium-devel
+BuildRequires:  python-setuptools
-
+# libnacl/__init__.py only looks for sonames 17, 13, 10, 5, 4
+# plus 18 with Patch0
+BuildRequires:  libsodium-devel <= 1.0.8
 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}) = %%{epoch}:%%{version}\n" 'libsodium*' | grep -v libsodium-devel | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+%(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")
 
 %description
 This library is used to gain direct access to the functions exposed by Daniel J. Bernstein's nacl library via libsodium.
@@ -43,6 +47,7 @@ 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