diff --git a/python-bashate.spec b/python-bashate.spec index 1e6ffe0..1811ded 100644 --- a/python-bashate.spec +++ b/python-bashate.spec @@ -1,12 +1,9 @@ %global pypi_name bashate -%if 0%{?fedora} -%global with_python3 1 -%endif Name: python-%{pypi_name} Version: 0.5.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A pep8 equivalent for bash scripts License: ASL 2.0 @@ -26,27 +23,6 @@ to fill the same part of code review that pep8 does in most OpenStack projects. It started from humble beginnings in the DevStack project, and will continue to evolve over time. -%package -n python2-%{pypi_name} -Summary: A pep8 equivalent for bash scripts -%{?python_provide:%python_provide python2-%{pypi_name}} - -BuildRequires: python2-devel -BuildRequires: python2-pbr -BuildRequires: python2-fixtures -BuildRequires: python2-mock - -Requires: python2-setuptools -Requires: python2-pbr -Requires: python2-babel - -%description -n python2-%{pypi_name} -It is a pep8 equivalent for bash scripts. -This program attempts to be an automated style checker for bash scripts -to fill the same part of code review that pep8 does in most OpenStack -projects. It started from humble beginnings in the DevStack project, -and will continue to evolve over time. - -%if 0%{?with_python3} %package -n python3-%{pypi_name} Summary: A pep8 equivalent for bash scripts %{?python_provide:%python_provide python3-%{pypi_name}} @@ -67,15 +43,14 @@ This program attempts to be an automated style checker for bash scripts to fill the same part of code review that pep8 does in most OpenStack projects. It started from humble beginnings in the DevStack project, and will continue to evolve over time. -%endif %package -n python-%{pypi_name}-doc Summary: Documentation for bashate module -BuildRequires: python2-sphinx -BuildRequires: python2-oslo-sphinx -BuildRequires: python2-reno +BuildRequires: python3-sphinx +BuildRequires: python3-oslo-sphinx +BuildRequires: python3-reno %description -n python-%{pypi_name}-doc @@ -89,70 +64,38 @@ rm -rf %{pypi_name}.egg-info rm -rf {test-,}requirements.txt %build -%py2_build # doc export PYTHONPATH="$( pwd ):$PYTHONPATH" pushd doc -sphinx-build-2 -b html -d build/doctrees source build/html +sphinx-build-3 -b html -d build/doctrees source build/html popd rm -fr doc/build/html/.buildinfo -%if 0%{?with_python3} %py3_build -%endif %install -%if 0%{?with_python3} %py3_install -mv %{buildroot}%{_bindir}/%{pypi_name} %{buildroot}%{_bindir}/%{pypi_name}-%{python3_version} -ln -s ./%{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3 -%endif - -%py2_install -mv %{buildroot}%{_bindir}/%{pypi_name} %{buildroot}%{_bindir}/%{pypi_name}-%{python2_version} -ln -s ./%{pypi_name}-%{python2_version} %{buildroot}%{_bindir}/%{pypi_name}-2 -%if 0%{?with_python3} -ln -s ./%{pypi_name}-3 %{buildroot}%{_bindir}/%{pypi_name} -%else -ln -s ./%{pypi_name}-2 %{buildroot}%{_bindir}/%{pypi_name} -%endif %check -%{__python2} setup.py test - -%if 0%{?with_python3} %{__python3} setup.py test -%endif -%files -n python2-%{pypi_name} -%doc README.rst -%license LICENSE -%if !0%{?with_python3} -%{_bindir}/%{pypi_name} -%endif -%{_bindir}/%{pypi_name}-2 -%{_bindir}/%{pypi_name}-%{python2_version} -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info - - -%if 0%{?with_python3} %files -n python3-%{pypi_name} %doc README.rst %license LICENSE %{_bindir}/%{pypi_name} -%{_bindir}/%{pypi_name}-3 -%{_bindir}/%{pypi_name}-%{python3_version} %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif %files -n python-%{pypi_name}-doc %doc doc/build/html %license LICENSE %changelog +* Mon Feb 11 2019 Miro HronĨok - 0.5.1-11 +- Subpackage python2-bashate has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 02 2019 Fedora Release Engineering - 0.5.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild