From 648218f343af36e96b34f97f50945071b33c4096 Mon Sep 17 00:00:00 2001 From: Markeryang <747675909@qq.com> Date: Wed, 5 Aug 2020 15:43:05 +0800 Subject: [PATCH 1/2] fix build fail fix build fail --- python-pynacl.spec | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/python-pynacl.spec b/python-pynacl.spec index 82f887b..bce03cd 100644 --- a/python-pynacl.spec +++ b/python-pynacl.spec @@ -3,7 +3,7 @@ Name: python-pynacl Summary: Python binding to the libsodium library Version: 1.4.0 -Release: 1 +Release: 2 License: ASL 2.0 URL: https://github.com/pyca/pynacl Source0: https://github.com/pyca/pynacl/archive/%{version}/pynacl-%{version}.tar.gz @@ -15,19 +15,6 @@ PyNaCl is a Python binding to libsodium, which is a fork of the Networking and C These libraries have a stated goal of improving usability, security and speed. It supports Python 2.7 and 3.4+ as well as PyPy 2.6+. -%package -n python2-pynacl -Summary: Python binding to the libsodium library - -BuildRequires: python2-devel python2-setuptools python2-cffi >= 1.4.1 -BuildRequires: python2-six python2-pytest >= 3.2.1 python2-hypothesis >= 3.27.0 -BuildRequires: python2-wheel -%{?python_provide:%python_provide python2-pynacl} - -%description -n python2-pynacl -PyNaCl is a Python binding to libsodium, which is a fork of the Networking and Cryptography library. -These libraries have a stated goal of improving usability, security and speed. python2-pynacl supports -Python 2.7 as well as PyPy 2.6+. - %package -n python3-pynacl Summary: Python binding to the libsodium library @@ -47,25 +34,16 @@ rm -vrf src/libsodium/ %build export SODIUM_INSTALL=system -%py2_build %py3_build %install -%py2_install %py3_install %check %if %{with check} -PYTHONPATH=%{buildroot}%{python2_sitearch} py.test-2 -v PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v %endif -%files -n python2-pynacl -%license LICENSE -%doc README.rst -%{python2_sitearch}/PyNaCl-*.egg-info/ -%{python2_sitearch}/nacl/ - %files -n python3-pynacl %license LICENSE %doc README.rst @@ -73,6 +51,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v %{python3_sitearch}/nacl/ %changelog +* Wed Aug 5 2020 yanglongkang - 1.4.0-2 +- fix build fail + * Thu Jul 16 2020 jixinjie - 1.4.0-1 - update package to 1.4.0 -- Gitee From 78130ddc522c0fdcd5aed9ecb1ed689c4e6f1c46 Mon Sep 17 00:00:00 2001 From: Markeryang <747675909@qq.com> Date: Wed, 5 Aug 2020 16:11:16 +0800 Subject: [PATCH 2/2] update python-pynacl.spec. --- python-pynacl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pynacl.spec b/python-pynacl.spec index bce03cd..976a434 100644 --- a/python-pynacl.spec +++ b/python-pynacl.spec @@ -52,7 +52,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v %changelog * Wed Aug 5 2020 yanglongkang - 1.4.0-2 -- fix build fail +- fix build fail,delete python2 buildrequire * Thu Jul 16 2020 jixinjie - 1.4.0-1 - update package to 1.4.0 -- Gitee