python-bcrypt.spec

@@ -1,96 +1,73 @@
-%global _empty_manifest_terminate_build 0
 Name:          python-bcrypt
-Version:        3.2.0
+Summary:       Good password hashing for your software and your servers
-Release:        2
+Version:       3.1.4
-Summary:        Modern password hashing for your software and your servers
+Release:       7
-License:        Apache-2.0
+License:       ASL 2.0 and Public Domain and BSD
-URL:            https://github.com/pyca/bcrypt/
+URL:           http://pypi.python.org/pypi/bcrypt
-Source0:        https://files.pythonhosted.org/packages/d8/ba/21c475ead997ee21502d30f76fd93ad8d5858d19a3fad7cd153de698c4dd/bcrypt-3.2.0.tar.gz
+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:        Modern password hashing for your software and your servers
+Summary:       Good password hashing for your software and your servers
-Provides:       python-bcrypt
+Requires:      python3-six python3-cffi
-# Base build requires
+Conflicts:     python3-py-bcritp
-BuildRequires:  python3-devel
+Provides:      python3-py-bcrypt = 0.4-11
-BuildRequires:  python3-setuptools
+Obsoletes:     python3-py-bcrypt < 0.4-11
-BuildRequires:  python3-cffi
+%{?python_provide:%python_provide python3-bcrypt}
-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 2.7, 3.4+, and PyPy 2.6+.
+This library should be compatible with py-bcrypt and it will run on Python 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-3.2.0
+%autosetup -n bcrypt-%{version}
 
 %build
+%{__python2} setup.py build
 %py3_build
 
 %install
 %py3_install
+%{__python2} setup.py install --skip-build --root %{buildroot}
 
-install -d -m755 %{buildroot}/%{_pkgdocdir}
+#find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod 755 {} ';'
-if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
+
-if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
+#find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'
-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
+%{__python2} setup.py test
 %{__python3} setup.py test
 
-%files -n python3-bcrypt -f filelist.lst
+%files        -n python2-bcrypt
-%dir %{python3_sitearch}/*
+%doc README.rst
+%license LICENSE
+%{python2_sitearch}/bcrypt/
+%{python2_sitearch}/bcrypt-%{version}*
+
+%files        -n python3-bcrypt
+%doc README.rst
+%license LICENSE
+%{python3_sitearch}/bcrypt/
+%{python3_sitearch}/bcrypt-%{version}*
 
-%files help -f doclist.lst
-%{_docdir}/*
 
 %changelog
-* Tue Oct 25 2022 zhangruifang <zhangruifang1@h-partners.com> - 3.2.0-2
-- Rebuild for next release
-
-* 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
-- SUG:NA
-- DESC:Don't emit warning in test_kdf, there's no point whoops here
-
-* Wed Oct 21 2020 jinzhimin<jinzhimin2@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

python-bcrypt.yaml

@@ -1,4 +0,0 @@
-version-ctrl: pypi
-src_repo: bcrypt
-tag_prefix: "^v"
-seperator: "."