3 changed files with 69 additions and 48 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/bcrypt-3.2.2.tar.gz
+SOURCES/bcrypt-3.1.6.tar.gz
--- a/.python-bcrypt.metadata
+++ b/.python-bcrypt.metadata
@ -1 +1 @@
-22405079ac8718adf078e06575c66dbabc8d5068  SOURCES/bcrypt-3.2.2.tar.gz
+03a17719edea2f3d1e32b5c510171df304769542  SOURCES/bcrypt-3.1.6.tar.gz
--- a/SPECS/python-bcrypt.spec
+++ b/SPECS/python-bcrypt.spec
@ -1,21 +1,37 @@
 %{!?_licensedir: %global license %%doc}
+%global with_python2 1

+%if 0%{?rhel} && 0%{?rhel} >= 8
+%global with_python2 0
+%endif

 %global modname bcrypt
 %global sum     Modern password hashing for your software and your servers

 Name:               python-bcrypt
-Version:            3.2.2
-Release:            1%{?dist}
+Version:            3.1.6
+Release:            2%{?dist}.1
 Summary:            %{sum}

 #crypt_blowfish code is in Public domain and all other code in ASL 2.0
 License:            ASL 2.0 and Public Domain and BSD
 URL:                http://pypi.python.org/pypi/bcrypt
-Source0:            %pypi_source bcrypt
+Source0:            https://files.pythonhosted.org/packages/source/b/%{modname}/%{modname}-%{version}.tar.gz

 BuildRequires:  gcc

+%if 0%{?with_python2}
+BuildRequires:      python2-devel
+BuildRequires:      python2-setuptools
+BuildRequires:      python2-six
+BuildRequires:      python2-pytest
+%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7)
+BuildRequires:      python-cffi
+%else
+BuildRequires:      python2-cffi
+%endif
+%endif
+
 BuildRequires:      python%{python3_pkgversion}-devel
 BuildRequires:      python%{python3_pkgversion}-setuptools
 BuildRequires:      python%{python3_pkgversion}-cffi
@ -26,6 +42,25 @@ BuildRequires:      python%{python3_pkgversion}-pytest
 %{sum}.


+%if 0%{?with_python2}
+%package -n python2-%{modname}
+Summary:            %{sum}
+%{?python_provide:%python_provide python2-%{modname}}
+
+Requires:           python2-six
+%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7)
+Requires:           python-cffi
+%else
+Requires:           python2-cffi
+%endif
+Provides:           py-bcrypt = 0.4-11
+Obsoletes:          py-bcrypt < 0.4-11
+
+%description -n python2-%{modname}
+%{sum}.
+%endif
+
+
 %package -n python%{python3_pkgversion}-%{modname}
 Summary:            %{sum}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
@ -44,21 +79,43 @@ Obsoletes:          python3-py-bcrypt < 0.4-11
 %autosetup -n %{modname}-%{version}

 %build
+%if 0%{?with_python2}
+%py2_build
+%endif
+
 %py3_build

 %install
+%if 0%{?with_python2}
+%py2_install
+%endif
+
 %py3_install

 # Better safe than sorry
+%if 0%{?with_python2}
+find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod 755 {} ';'
+%endif
 find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'

 %check
 # Tests can't run on epel7 due to an old pytest
-%if 0%{?rhel} > 7 || 0%{?fedora}
+%if (0%{?rhel} && 0%{?rhel} > 7)
+%if 0%{?with_python2}
+%{__python2} setup.py test
+%endif
 %{__python3} setup.py test
 %endif


+%if 0%{?with_python2}
+%files -n python2-%{modname}
+%doc README.rst
+%license LICENSE
+%{python2_sitearch}/%{modname}/
+%{python2_sitearch}/%{modname}-%{version}*
+%endif
+
 %files -n python%{python3_pkgversion}-%{modname}
 %doc README.rst
 %license LICENSE
@ -67,48 +124,12 @@ find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'


 %changelog
-* Tue Jul 30 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.2.2-1
- Rebuilt for MSVSphere 9.4
-
-* Mon May 02 2022 Major Hayden <major@mhtx.net> - 3.2.2-1
- Update to 3.2.2
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Major Hayden <major@mhtx.net> - 3.2.0-1
- Update to 3.2.0
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 3.1.7-8
- Rebuilt for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.1.7-5
- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Oct 13 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.7-3
- Subpackage python2-bcrypt has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.7-2
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Tue Aug 20 2019 Pierre-Yves Chibon <pingou@pingoured.fr> - 3.1.7-1
- Update to 3.1.7
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.6-4
- Rebuilt for Python 3.8
+* Fri Jul 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.1.6-2R.1
+- Rebuilt for MSVSphere 8.10

-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Wed Jun 19 2019 Troy Dawson <tdawson@redhat.com> - 3.1.6-1.1
+- Make python2 optional
+- Do not build python2 on RHEL8

 * Mon Mar 18 2019 Marc Dequènes (Duck) <duck@redhat.com> - 3.1.6-2
 - Adaptations to build Python 3 on EPEL
@ -150,7 +171,7 @@ find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

 * Tue Jun 06 2017 William Moreno <williamjmorenor@gmail.com> - 3.1.3-1
- Update to 3.1.3 upstream release
+- Update to 3.1.3 upstream release 

 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild