diff --git a/python-crypto.spec b/python-crypto.spec index 7896a9c..38420a5 100644 --- a/python-crypto.spec +++ b/python-crypto.spec @@ -1,16 +1,13 @@ -# Share docs between python2 and python3 packages +# Share docs between packages for multiple python versions %global _docdir_fmt %{name} # Single python3 version in Fedora, python3_pkgversion macro not available %{!?python3_pkgversion:%global python3_pkgversion 3} -# For consistency and completeness -%global python2_pkgversion 2 - Summary: Cryptography library for Python Name: python-crypto Version: 2.6.1 -Release: 29%{?dist} +Release: 30%{?dist} # Mostly Public Domain apart from parts of HMAC.py and setup.py, which are Python License: Public Domain and Python URL: http://www.pycrypto.org/ @@ -28,7 +25,6 @@ BuildRequires: findutils BuildRequires: gcc BuildRequires: gmp-devel >= 4.1 BuildRequires: libtomcrypt-devel >= 1.16 -BuildRequires: python%{python2_pkgversion}-devel >= 2.4 BuildRequires: python%{python3_pkgversion}-devel BuildRequires: %{_bindir}/2to3 @@ -36,17 +32,6 @@ BuildRequires: %{_bindir}/2to3 PyCrypto is a collection of both secure hash functions (such as MD5 and SHA), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). -%package -n python%{python2_pkgversion}-crypto -Summary: Cryptography library for Python 2 -Provides: pycrypto = %{version}-%{release} -%{?python_provide:%python_provide python2-crypto} - -%description -n python%{python2_pkgversion}-crypto -PyCrypto is a collection of both secure hash functions (such as MD5 and -SHA), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). - -This is the Python 2 build of the package. - %package -n python%{python3_pkgversion}-crypto Summary: Cryptography library for Python 3 %{?python_provide:%python_provide python%{python3_pkgversion}-crypto} @@ -105,31 +90,20 @@ cp pct-speedtest.py pct-speedtest3.py %build %global optflags %{optflags} -fno-strict-aliasing -%py2_build %py3_build %install -%py2_install %py3_install # Remove group write permissions on shared objects -find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod -c g-w {} \; find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod -c g-w {} \; %check -%{__python2} setup.py test %{__python3} setup.py test # Benchmark -PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} pct-speedtest.py PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} pct-speedtest3.py -%files -n python%{python2_pkgversion}-crypto -%license COPYRIGHT LEGAL/ -%doc README TODO ACKS ChangeLog Doc/ -%{python2_sitearch}/Crypto/ -%{python2_sitearch}/pycrypto-%{version}-py2.*.egg-info - %files -n python%{python3_pkgversion}-crypto %license COPYRIGHT LEGAL/ %doc README TODO ACKS ChangeLog Doc/ @@ -137,6 +111,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} pct-speedtest3.py %{python3_sitearch}/pycrypto-%{version}-py3.*.egg-info %changelog +* Wed Jan 29 2020 Paul Howarth - 2.6.1-30 +- Drop Python 2 support + * Thu Oct 03 2019 Miro HronĨok - 2.6.1-29 - Rebuilt for Python 3.8.0rc1 (#1748018)