!19 [sync] PR-18: Upgrade package version for OpenStack Wallaby support

From: @openeuler-sync-bot
Reviewed-by: @yangzhao_kl
Signed-off-by: @yangzhao_kl

backport-Don-t-emit-warnings-here-there-s-no-point-137.patch

@@ -1,30 +0,0 @@
-From ea76ee82eba1700e1143022050b368460fc9cd7f Mon Sep 17 00:00:00 2001
-From: Alex Gaynor <alex.gaynor@gmail.com>
-Date: Sun, 3 Dec 2017 20:43:38 -0600
-Subject: [PATCH 01/73] Don't emit warnings here, there's no point (#137)
-
-* Don't emit warnings here, there's no point
-
-* whoops here
----
- tests/test_bcrypt.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_bcrypt.py b/tests/test_bcrypt.py
-index 7ad40f7..3f00875 100644
---- a/tests/test_bcrypt.py
-+++ b/tests/test_bcrypt.py
-@@ -400,7 +400,9 @@ def test_checkpw_extra_data():
-         b"\x43\x66\x6c\x9b\x09\xef\x33\xed\x8c\x27\xe8\xe8\xf3\xe2\xd8\xe6"
-     ]])
- def test_kdf(rounds, password, salt, expected):
--    derived = bcrypt.kdf(password, salt, len(expected), rounds)
-+    derived = bcrypt.kdf(
-+        password, salt, len(expected), rounds, ignore_few_rounds=True
-+    )
-     assert derived == expected
- 
- 
--- 
-2.23.0
-

python-bcrypt.spec

@@ -1,34 +1,39 @@
+%global _empty_manifest_terminate_build 0
 Name:           python-bcrypt
-Summary:       Good password hashing for your software and your servers
+Version:        3.2.0
-Version:       3.1.4
+Release:        1
-Release:       9
+Summary:        Modern password hashing for your software and your servers
-License:       ASL 2.0 and Public Domain and BSD
+License:        Apache-2.0
-URL:           http://pypi.python.org/pypi/bcrypt
+URL:            https://github.com/pyca/bcrypt/
-Source0:       https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/d8/ba/21c475ead997ee21502d30f76fd93ad8d5858d19a3fad7cd153de698c4dd/bcrypt-3.2.0.tar.gz
-
-Patch6000:    backport-Don-t-emit-warnings-here-there-s-no-point-137.patch
-
-BuildRequires: gcc
-BuildRequires: python3-devel python3-setuptools python3-cffi python3-six python3-pytest
-
 %description
 Good password hashing for your software and your servers.
 This library should be compatible with py-bcrypt and it will run on Python 2.7, 3.4+, and PyPy 2.6+.
 
 %package -n python3-bcrypt
-Summary:       Good password hashing for your software and your servers
+Summary:        Modern password hashing for your software and your servers
-Requires:      python3-six python3-cffi
+Provides:       python-bcrypt
-Conflicts:     python3-py-bcritp
+# Base build requires
-Provides:      python3-py-bcrypt = 0.4-11
+BuildRequires:  python3-devel
-Obsoletes:     python3-py-bcrypt < 0.4-11
+BuildRequires:  python3-setuptools
-%{?python_provide:%python_provide python3-bcrypt}
+BuildRequires:  python3-cffi
-
+BuildRequires:  gcc
+BuildRequires:  gdb
+BuildRequires:  python3-six
+BuildRequires:  python3-pytest
 %description -n python3-bcrypt
 Good password hashing for your software and your servers.
-This library should be compatible with py-bcrypt and it will run on Python 3.4+ and PyPy 2.6+.
+This library should be compatible with py-bcrypt and it will run on Python 2.7, 3.4+, and PyPy 2.6+.
+
+%package help
+Summary:        Modern password hashing for your software and your servers
+Provides:       python3-bcrypt-doc
+%description help
+Good password hashing for your software and your servers.
+This library should be compatible with py-bcrypt and it will run on Python 2.7, 3.4+, and PyPy 2.6+.
 
 %prep
-%autosetup -n bcrypt-%{version} -p1
+%autosetup -n bcrypt-3.2.0
 
 %build
 %py3_build
@@ -36,19 +41,45 @@ This library should be compatible with py-bcrypt and it will run on Python 3.4+
 %install
 %py3_install
 
-#find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'
+install -d -m755 %{buildroot}/%{_pkgdocdir}
+if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
+if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
+if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi
+if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi
+pushd %{buildroot}
+if [ -d usr/lib ]; then
+    find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/lib64 ]; then
+    find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/bin ]; then
+    find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/sbin ]; then
+    find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+touch doclist.lst
+if [ -d usr/share/man ]; then
+    find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst
+fi
+popd
+mv %{buildroot}/filelist.lst .
+mv %{buildroot}/doclist.lst .
 
 %check
 %{__python3} setup.py test
 
-%files        -n python3-bcrypt
+%files -n python3-bcrypt -f filelist.lst
-%doc README.rst
+%dir %{python3_sitearch}/*
-%license LICENSE
-%{python3_sitearch}/bcrypt/
-%{python3_sitearch}/bcrypt-%{version}*
 
+%files help -f doclist.lst
+%{_docdir}/*
 
 %changelog
+* Wed Jul 14 2021 OpenStack_SIG <openstack@openeuler.org> - 3.2.0-1
+- Upgrade to version 3.2.0
+
 * Sat Feb 27 2021 extinctfire <shenyining_00@126.com> - 3.1.4-9
 - Type:bugfix
 - ID:NA