diff --git a/python-auth-credential.spec b/python-auth-credential.spec index 4e25d4f..a8f010e 100644 --- a/python-auth-credential.spec +++ b/python-auth-credential.spec @@ -1,22 +1,16 @@ -%if 0%{?fedora} > 12 || 0%{?rhel} > 7 -%global with_python3 1 -%endif %global srcname auth.credential Name: python-auth-credential Version: 1.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Python abstraction of a credential Group: Development/Libraries License: ASL 2.0 URL: https://github.com/cern-mig/%{name} Source0: http://pypi.python.org/packages/source/a/%{srcname}/%{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -%if 0%{?with_python3} BuildRequires: python3-devel -%endif # if with_python3 %global _description\ This module offers an abstraction of a credential, i.e. something that\ @@ -33,14 +27,6 @@ module Authen::Credential. %description %_description -%package -n python2-auth-credential -Summary: %summary -Provides: python2-auth-credential -%{?python_provide:%python_provide python2-auth-credential} - -%description -n python2-auth-credential %_description - -%if 0%{?with_python3} %package -n python3-auth-credential Summary: Python abstraction of a credential Group: Development/Libraries @@ -57,54 +43,31 @@ well known targets. The python module auth.credential is compatible with the Perl module Authen::Credential. -%endif # with_python3 %prep %setup -q -n %{srcname}-%{version} -%if 0%{?with_python3} -rm -fr %{py3dir} -cp -a . %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' -%endif # with_python3 +find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %build -%{__python2} setup.py build -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py build -popd -%endif # with_python3 %install rm -fr $RPM_BUILD_ROOT -%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -popd -%endif # with_python3 %check -%{__python2} setup.py test -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py test -popd -%endif # with_python3 -%files -n python2-auth-credential -%doc LICENSE README.rst CHANGES -%{python2_sitelib}/auth/ -%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info - -%if 0%{?with_python3} %files -n python3-auth-credential %doc LICENSE README.rst CHANGES %{python3_sitelib}/auth/ %{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info -%endif # with_python3 %changelog +* Wed Oct 17 2018 Zbigniew Jędrzejewski-Szmek - 1.0-18 +- Subpackage python2-auth-credential has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Mon Jul 23 2018 Lionel Cons - 1.0-17 - Fixed building using Python 2 (#1605603).