From 956beb084f86a7065a2531e1839e9de2bf517c9e Mon Sep 17 00:00:00 2001
From: jpzhang <jpzhang187@163.com>
Date: Fri, 11 Sep 2020 20:13:15 +0800
Subject: [PATCH] Remove python2-bcrypt subpackage

---
 python-bcrypt.spec | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/python-bcrypt.spec b/python-bcrypt.spec
index a6a3579..a7724ac 100644
--- a/python-bcrypt.spec
+++ b/python-bcrypt.spec
@@ -1,29 +1,17 @@
 Name:          python-bcrypt
 Summary:       Good password hashing for your software and your servers
 Version:       3.1.4
-Release:       7
+Release:       8
 License:       ASL 2.0 and Public Domain and BSD
 URL:           http://pypi.python.org/pypi/bcrypt
 Source0:       https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz
 
-BuildRequires: gcc python2-devel python2-setuptools python2-six python2-pytest python2-cffi
 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 python2-bcrypt
-Summary:       Good password hashing for your software and your servers
-Requires:      python2-six python2-cffi
-Provides:      py-bcrypt = 0.4-11
-Obsoletes:     py-bcrypt < 0.4-11
-%{?python_provide:%python_provide python2-bcrypt}
-
-%description   -n python2-bcrypt
-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 and PyPy 2.6+.
-
 %package       -n python3-bcrypt
 Summary:       Good password hashing for your software and your servers
 Requires:      python3-six python3-cffi
@@ -40,27 +28,14 @@ This library should be compatible with py-bcrypt and it will run on Python 3.4+
 %autosetup -n bcrypt-%{version}
 
 %build
-%{__python2} setup.py build
 %py3_build
 
 %install
 %py3_install
-%{__python2} setup.py install --skip-build --root %{buildroot}
-
-#find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod 755 {} ';'
-
-#find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'
 
 %check
-%{__python2} setup.py test
 %{__python3} setup.py test
 
-%files        -n python2-bcrypt
-%doc README.rst
-%license LICENSE
-%{python2_sitearch}/bcrypt/
-%{python2_sitearch}/bcrypt-%{version}*
-
 %files        -n python3-bcrypt
 %doc README.rst
 %license LICENSE
@@ -69,5 +44,8 @@ This library should be compatible with py-bcrypt and it will run on Python 3.4+
 
 
 %changelog
+* Fri Sep 11 2020 zhangjiapeng <zhangjiapeng9@huawei.com> - 3.1.4-8
+- Remove python2-bcrypt subpackage
+
 * Wed Nov 13 2019 Lijin Yang <yanglijin@huawei.com> - 3.1.4-7
 - init package
-- 
Gitee