5 changed files with 61 additions and 114 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/pynacl-1.4.0.tar.gz
+SOURCES/pynacl-1.3.0.tar.gz
--- a/.python-pynacl.metadata
+++ b/.python-pynacl.metadata
@ -1 +1 @@
-e18c3803dd7944afd7b00c8c43c3c61fcb75136f  SOURCES/pynacl-1.4.0.tar.gz
+f0b09d0168e8f6fbefb0cff0d6eb26ae484bee4e  SOURCES/pynacl-1.3.0.tar.gz
--- a/SOURCES/480.patch
+++ b/SOURCES/480.patch
@ -0,0 +1,29 @@
+From af2d8c241872318baba42d7f5fbfb1869de91baa Mon Sep 17 00:00:00 2001
+From: Valentin Heidelberger <github@valentinsblog.com>
+Date: Thu, 27 Sep 2018 22:36:34 +0200
+Subject: [PATCH] Remove average_size hypothesis setting from test_bindings.py
+
+---
+ tests/test_bindings.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/test_bindings.py b/tests/test_bindings.py
+index 22930cc7..d7951a21 100644
+--- a/tests/test_bindings.py
+++ b/tests/test_bindings.py
+@@ -306,7 +306,6 @@ def test_unpad_not_padded():
+ 
+ 
+ @given(binary(min_size=0,
+-              average_size=128,
+               max_size=2049),
+        integers(min_value=16,
+                 max_value=256)
+@@ -320,7 +319,6 @@ def test_pad_sizes(msg, bl_sz):
+ 
+ 
+ @given(binary(min_size=0,
+-              average_size=128,
+               max_size=2049),
+        integers(min_value=16,
+                 max_value=256)
--- a/SOURCES/596.patch
+++ b/SOURCES/596.patch
@ -1,58 +0,0 @@
-From 1a14a865a27467914be183f5465c29b36fd27f88 Mon Sep 17 00:00:00 2001
-From: Scott Kitterman <scott@kitterman.com>
-Date: Tue, 26 May 2020 17:03:17 -0400
-Subject: [PATCH 1/2] Remove spurious requirement for wheel
-
---
- pyproject.toml | 1 -
- setup.py       | 3 +--
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index ed437acd..94baf50c 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,7 +2,6 @@
- # Must be kept in sync with `setup_requirements` in `setup.py`
- requires = [
-     "setuptools>=40.8.0",
-    "wheel",
-     "cffi>=1.4.1; python_implementation != 'PyPy'",
- ]
- build-backend = "setuptools.build_meta"
-diff --git a/setup.py b/setup.py
-index 9319c1cb..d82a7fe3 100644
--- a/setup.py
-+++ b/setup.py
-@@ -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",
-
-From 5eb5f1e70580a386d9a95b74eda1a54af13f5e3a Mon Sep 17 00:00:00 2001
-From: Scott Kitterman <scott@kitterman.com>
-Date: Tue, 26 May 2020 18:44:33 -0400
-Subject: [PATCH 2/2] Put wheel back in pyproject.toml
-
---
- pyproject.toml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 94baf50c..ed437acd 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,6 +2,7 @@
- # Must be kept in sync with `setup_requirements` in `setup.py`
- requires = [
-     "setuptools>=40.8.0",
-+    "wheel",
-     "cffi>=1.4.1; python_implementation != 'PyPy'",
- ]
- build-backend = "setuptools.build_meta"
--- a/SPECS/python-pynacl.spec
+++ b/SPECS/python-pynacl.spec
@ -1,32 +1,42 @@
+%{?python_enable_dependency_generator}
 %bcond_without check

 %global modname pynacl

 Name:           python-%{modname}
-Version:        1.4.0
-Release:        6%{?dist}
+Version:        1.3.0
+Release:        5%{?dist}
 Summary:        Python binding to the Networking and Cryptography (NaCl) library

 License:        ASL 2.0
 URL:            https://github.com/pyca/pynacl
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz

-# remove spurious wheel dependency
-Patch1:         %{url}/pull/596.patch
+# hypothesis 4 support
+Patch1:         %{url}/pull/480.patch

 BuildRequires:  gcc
 BuildRequires:  libsodium-devel
+BuildRequires:  sed

-%global _description %{expand:
-PyNaCl is a Python binding to the Networking and Cryptography library,
-a crypto library with the stated goal of improving usability, security
-and speed.}
+%global _description \
+PyNaCl is a Python binding to the Networking and Cryptography library,\
+a crypto library with the stated goal of improving usability, security\
+and speed.

 %description %{_description}

 %package -n python3-%{modname}
 Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{modname}}
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-cffi >= 1.4.1
+%if %{with check}
+BuildRequires:  python3-six
+BuildRequires:  python3-pytest >= 3.2.1
+BuildRequires:  python3-hypothesis >= 3.27.0
+%endif

 %description -n python3-%{modname} %{_description}

@ -44,64 +54,30 @@ rm -vrf src/libsodium/
 sed -i 's/@settings(deadline=1500, max_examples=5)/@settings(deadline=4000, max_examples=5)/' tests/test_pwhash.py
 %endif

-%generate_buildrequires
-%pyproject_buildrequires %{?with_check:-x tests}
-
 %build
 export SODIUM_INSTALL=system
-%pyproject_wheel
+%py3_build

 %install
-%pyproject_install
-%pyproject_save_files nacl
+%py3_install

-%check
 %if %{with check}
-%pytest
-%else
-%pyproject_check_import
+%check
+PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v
 %endif

-%files -n python3-%{modname} -f %{pyproject_files}
+%files -n python3-%{modname}
+%license LICENSE
 %doc README.rst
+%{python3_sitearch}/PyNaCl-*.egg-info/
+%{python3_sitearch}/nacl/

 %changelog
-* Tue Jul 30 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.4.0-6
- Rebuilt for MSVSphere 9.4
-
-* Wed May 11 2022 Carl George <carl@george.computer> - 1.4.0-6
- Convert to pyproject macros
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.4.0-3
- Rebuilt for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Aug 26 2020 Damien Ciabrini <dciabrin@redhat.com> - 1.4.0-1
- Update to 1.4.0 (#1840424)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-8
- Rebuilt for Python 3.9
-
-* Mon May 11 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-7
- Fix build with hypothesis 5 (#1830961)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Fri Jul 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1.3.0-5
+- Rebuilt for MSVSphere 8.10

-* Sun Oct 13 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-5
- Subpackage python2-pynacl has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+* Fri Oct 11 2019 Paul Howarth <paul@city-fan.org> - 1.3.0-5
+- Drop Python 2 support

 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.0-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)