[packages/python3-PyNaCl] - python-PyNaCl.spec updated to 1.5.0 for python 3.6+

qboosh qboosh at pld-linux.org
Wed Apr 27 20:29:12 CEST 2022


commit 2600e18a03efa67f95b90e5ba0819a74dc301bfb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 27 20:29:08 2022 +0200

    - python-PyNaCl.spec updated to 1.5.0 for python 3.6+

 python-PyNaCl-no-wheel.patch              | 12 -----
 python-PyNaCl.spec => python3-PyNaCl.spec | 79 +++----------------------------
 2 files changed, 7 insertions(+), 84 deletions(-)
---
diff --git a/python-PyNaCl.spec b/python3-PyNaCl.spec
similarity index 57%
rename from python-PyNaCl.spec
rename to python3-PyNaCl.spec
index d504601..7a066d6 100644
--- a/python-PyNaCl.spec
+++ b/python3-PyNaCl.spec
@@ -8,43 +8,26 @@
 %define		module	PyNaCl
 Summary:	Python 2 binding to the Networking and Cryptography (NaCl) library
 Summary(pl.UTF-8):	Wiązania Pythona 2 do biblioteki NaCl (Networking and Cryptography)
-Name:		python-%{module}
-# keep 1.4.x here for python2 support
-Version:	1.4.0
-Release:	6
+Name:		python3-%{module}
+Version:	1.5.0
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Python
 Source0:	https://github.com/pyca/pynacl/archive/%{version}/pynacl-%{version}.tar.gz
-# Source0-md5:	50b7f2d00b16c270095b7ae4bea9fba8
-Patch0:		%{name}-no-wheel.patch
+# Source0-md5:	5f4332422b2be24fb1584eb447061b30
 URL:		https://github.com/dstufft/pynacl/
 BuildRequires:	libsodium-devel >= 1.0.18
-%if %{with python2}
-BuildRequires:	python-cffi >= 1.4.1
-BuildRequires:	python-devel >= 1:2.7
-BuildRequires:	python-modules >= 1:2.7
-BuildRequires:	python-setuptools
-%if %{with tests}
-BuildRequires:	python-hypothesis >= 3.27.0
-BuildRequires:	python-pytest >= 3.3.1
-BuildRequires:	python-six
-%endif
-%endif
-%if %{with python3}
 BuildRequires:	python3-cffi >= 1.4.1
-BuildRequires:	python3-devel >= 1:3.5
-BuildRequires:	python3-modules >= 1:3.5
+BuildRequires:	python3-devel >= 1:3.6
+BuildRequires:	python3-modules >= 1:3.6
 BuildRequires:	python3-setuptools
 %if %{with tests}
 BuildRequires:	python3-hypothesis >= 3.27.0
 BuildRequires:	python3-pytest >= 3.3.1
-BuildRequires:	python3-six
-%endif
 %endif
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with doc}
-BuildRequires:	python3-six
 BuildRequires:	python3-sphinx_rtd_theme
 BuildRequires:	sphinx-pdg-3 >= 1.6.5
 %endif
@@ -59,20 +42,6 @@ Networking and Cryptography library.
 PyNaCl to wiązanie Pythona do libsodium - odgałęzienia biblioteki
 NaCl (Networking and Cryptography).
 
-%package -n python3-%{module}
-Summary:	Python 3 binding to the Networking and Cryptography (NaCl) library
-Summary(pl.UTF-8):	Wiązania Pythona 3 do biblioteki NaCl (Networking and Cryptography)
-Group:		Libraries/Python
-Requires:	libsodium >= 1.0.18
-
-%description -n python3-%{module}
-PyNaCl is a Python binding to libsodium, which is a fork of the
-Networking and Cryptography library.
-
-%description -n python3-%{module} -l pl.UTF-8
-PyNaCl to wiązanie Pythona do libsodium - odgałęzienia biblioteki
-NaCl (Networking and Cryptography).
-
 %package apidocs
 Summary:	API documentation for PyNaCl module
 Summary(pl.UTF-8):	Dokumentacja API modułu PyNaCl
@@ -86,22 +55,10 @@ Dokumentacja API modułu PyNaCl.
 
 %prep
 %setup -q -n pynacl-%{version}
-%patch0 -p1
 
 %build
 export SODIUM_INSTALL=system
 
-%if %{with python2}
-%py_build
-
-%if %{with tests}
-PYTHONPATH=$(echo $(pwd)/build-2/lib.*) \
-PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
-%{__python} -m pytest tests
-%endif
-%endif
-
-%if %{with python3}
 %py3_build
 
 %if %{with tests}
@@ -109,7 +66,6 @@ PYTHONPATH=$(echo $(pwd)/build-3/lib.*) \
 PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
 %{__python3} -m pytest tests
 %endif
-%endif
 
 %if %{with doc}
 PYTHONPATH=$(echo $(pwd)/build-3/lib.*) \
@@ -122,43 +78,22 @@ rm -rf $RPM_BUILD_ROOT
 
 export SODIUM_INSTALL=system
 
-%if %{with python2}
-%py_install
-
-%py_postclean
-%endif
-
-%if %{with python3}
 %py3_install
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG.rst README.rst
-%dir %{py_sitedir}/nacl
-%attr(755,root,root) %{py_sitedir}/nacl/_sodium.so
-%{py_sitedir}/nacl/*.py[co]
-%{py_sitedir}/nacl/bindings
-%{py_sitedir}/nacl/pwhash
-%{py_sitedir}/PyNaCl-%{version}-py*.egg-info
-%endif
-
-%if %{with python3}
-%files -n python3-%{module}
-%defattr(644,root,root,755)
-%doc CHANGELOG.rst README.rst
 %dir %{py3_sitedir}/nacl
 %attr(755,root,root) %{py3_sitedir}/nacl/_sodium.abi3.so
+%{py3_sitedir}/nacl/py.typed
 %{py3_sitedir}/nacl/*.py
 %{py3_sitedir}/nacl/__pycache__
 %{py3_sitedir}/nacl/bindings
 %{py3_sitedir}/nacl/pwhash
 %{py3_sitedir}/PyNaCl-%{version}-py*.egg-info
-%endif
 
 %if %{with doc}
 %files apidocs
diff --git a/python-PyNaCl-no-wheel.patch b/python-PyNaCl-no-wheel.patch
deleted file mode 100644
index a6c94b4..0000000
--- a/python-PyNaCl-no-wheel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pynacl-1.4.0/setup.py.orig	2020-05-25 21:08:38.000000000 +0200
-+++ pynacl-1.4.0/setup.py	2021-02-16 19:15:25.587854544 +0100
-@@ -35,8 +35,7 @@
- 
- 
- requirements = ["six"]
--setup_requirements = ["setuptools",
--                      "wheel"]
-+setup_requirements = ["setuptools"]
- test_requirements = ["pytest>=3.2.1,!=3.3.0",
-                      "hypothesis>=3.27.0"]
- docs_requirements = ["sphinx>=1.6.5",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3-PyNaCl.git/commitdiff/2600e18a03efa67f95b90e5ba0819a74dc301bfb



More information about the pld-cvs-commit mailing list