diff --git a/.gitignore b/.gitignore index 30ec89f..3e83a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /autopep8-1.2.tar.gz /autopep8-1.2.1.tar.gz /autopep8-1.2.4.tar.gz +/autopep8-1.4.3.tar.gz diff --git a/python-autopep8.spec b/python-autopep8.spec index 03d471c..2b57732 100644 --- a/python-autopep8.spec +++ b/python-autopep8.spec @@ -1,13 +1,9 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global pypi_name autopep8 %global py3_name python3-%{pypi_name} Name: python-autopep8 -Version: 1.2.4 -Release: 10%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: The package autopep8 formats Python code based on the output of the pep8 utility License: MIT @@ -19,31 +15,16 @@ BuildArch: noarch %description autopep8 formats Python code based on the output of the pep8 utility. -%package -n python2-%{pypi_name} -Summary: The package autopep8 formats Python code based on the output of the pep8 utility - -BuildRequires: python2-devel -BuildRequires: python2-pep8 -Requires: python2-pep8 -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -autopep8 formats Python code based on the output of the pep8 utility. - - - -%if 0%{?with_python3} %package -n %{py3_name} Summary: The package autopep8 formats Python code based on the output of the pep8 utility %{?python_provide:%python_provide python3-%{pypi_name}} BuildRequires: python3-devel -BuildRequires: python3-pep8 -Requires: python3-pep8 +BuildRequires: python3-pycodestyle +Requires: python3-pycodestyle %description -n %{py3_name} autopep8 formats Python code based on the output of the pep8 utility. -%endif %prep @@ -53,50 +34,25 @@ touch test/__init__.py #test needs to be a python module otherwise test will fia %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif %check # rpmbuild forces the use of LANG=C which fails unit tests -%if 0%{?fedora} || 0%{?rhel} > 6 -LANG=C.UTF-8 %{__python2} setup.py test -%endif -%if 0%{?with_python3} %{__python3} setup.py test -%endif %install -%if 0%{?with_python3} -%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%py3_install mv %{buildroot}%{_bindir}/%{pypi_name} %{buildroot}%{_bindir}/%{py3_name} pushd %{buildroot}%{_bindir} ln -s %{py3_name} %{pypi_name}-3 ln -s %{py3_name} %{pypi_name}-%{python3_version} popd -%endif -%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -pushd %{buildroot}%{_bindir} -ln -s %{pypi_name} %{pypi_name}-2 -ln -s %{pypi_name} %{pypi_name}-%{python2_version} -popd - -%files -n python2-%{pypi_name} -%doc README.rst -%license LICENSE -%{python2_sitelib}/* -%{_bindir}/%{pypi_name} -%{_bindir}/%{pypi_name}-2 -%{_bindir}/%{pypi_name}-%{python2_version} - -%if 0%{?with_python3} %files -n %{py3_name} %license LICENSE %doc README.rst @@ -106,11 +62,13 @@ popd %{_bindir}/%{py3_name} %{_bindir}/%{pypi_name}-3 %{_bindir}/%{pypi_name}-%{python3_version} -%endif %changelog +* Tue Jan 29 2019 Matthias Runge - 1.4.3-1 +- update to 1.4.3, drop python2 subpackage + * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.2.4-10 - Drop explicit locale setting for python3, use C.UTF-8 for python2 See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot diff --git a/sources b/sources index 3dd13a0..e3b98b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcea19c0c5e505b425e2a78afb771f5c autopep8-1.2.4.tar.gz +SHA512 (autopep8-1.4.3.tar.gz) = a51b0f74c056207c869e8b9f178e08854cb274af56734373e2e6ad9626a1d28b6ec5beb7b90c4fa8c71d3d7c4ede199f716854f93f369d669ecc7095b09dee38