remove python2 dependency

This commit is contained in:
jinzhimin369 2020-10-30 14:28:32 +08:00
parent 88ab024267
commit ffd103636c

View File

@ -1,6 +1,6 @@
Name: python-rsa Name: python-rsa
Version: 3.4.2 Version: 3.4.2
Release: 12 Release: 13
Summary: Pure-Python RSA implementation Summary: Pure-Python RSA implementation
License: ASL 2.0 License: ASL 2.0
URL: http://stuvel.eu/rsa URL: http://stuvel.eu/rsa
@ -14,17 +14,6 @@ Python-RSA is a pure-Python RSA implementation. It supports
encryption and decryption, signing and verifying signatures, encryption and decryption, signing and verifying signatures,
and key generation according to PKCS#1 version 1.5. and key generation according to PKCS#1 version 1.5.
%package -n python2-rsa
%{?python_provide:%python_provide python2-rsa}
Summary: Pure-Python RSA implementation
BuildRequires: python2-devel, python2-setuptools, python2-pyasn1 >= 0.1.3
Requires: python2-pyasn1 >= 0.1.3, python2-setuptools
%description -n python2-rsa
Python-RSA is a pure-Python RSA implementation. It supports
encryption and decryption, signing and verifying signatures,
and key generation according to PKCS#1 version 1.5.
%package -n python3-rsa %package -n python3-rsa
%{?python_provide:%python_provide python3-rsa} %{?python_provide:%python_provide python3-rsa}
Summary: Pure-Python RSA implementation Summary: Pure-Python RSA implementation
@ -40,20 +29,9 @@ and key generation according to PKCS#1 version 1.5.
%autosetup -n rsa-%{version} -p1 %autosetup -n rsa-%{version} -p1
%build %build
%py2_build
%py3_build %py3_build
%install %install
%py2_install
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-priv2pub $RPM_BUILD_ROOT%{_bindir}/pyrsa-priv2pub-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-keygen $RPM_BUILD_ROOT%{_bindir}/pyrsa-keygen-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-sign $RPM_BUILD_ROOT%{_bindir}/pyrsa-sign-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-verify $RPM_BUILD_ROOT%{_bindir}/pyrsa-verify-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-bigfile-2
cp $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile-2
%py3_install %py3_install
mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-priv2pub $RPM_BUILD_ROOT%{_bindir}/pyrsa-priv2pub-3 mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-priv2pub $RPM_BUILD_ROOT%{_bindir}/pyrsa-priv2pub-3
mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-keygen $RPM_BUILD_ROOT%{_bindir}/pyrsa-keygen-3 mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-keygen $RPM_BUILD_ROOT%{_bindir}/pyrsa-keygen-3
@ -64,12 +42,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-verify $RPM_BUILD_ROOT%{_bindir}/pyrsa-verify
mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-bigfile-3 mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyrsa-encrypt-bigfile-3
mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile-3 mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile-3
%files -n python2-rsa
%doc README.md
%license LICENSE
%{_bindir}/pyrsa-*-2
%{python2_sitelib}/*
%files -n python3-rsa %files -n python3-rsa
%doc README.md %doc README.md
%license LICENSE %license LICENSE
@ -77,10 +49,12 @@ mv $RPM_BUILD_ROOT%{_bindir}/pyrsa-decrypt-bigfile $RPM_BUILD_ROOT%{_bindir}/pyr
%{python3_sitelib}/* %{python3_sitelib}/*
%check %check
%{__python2} setup.py test
%{__python3} setup.py test %{__python3} setup.py test
%changelog %changelog
* Fri Oct 30 2020 yanglongkang <yanglongkang@huawei.com> - 3.4.2-13
- remove python2 dependency
* Tue Aug 4 2020 yanglongkang <yanglongkang@huawei.com> - 3.4.2-12 * Tue Aug 4 2020 yanglongkang <yanglongkang@huawei.com> - 3.4.2-12
- fix CVE-2020-13757 - fix CVE-2020-13757