diff --git a/python-openstacksdk.spec b/python-openstacksdk.spec index f1f1142..73415ee 100644 --- a/python-openstacksdk.spec +++ b/python-openstacksdk.spec @@ -22,7 +22,7 @@ clouds - test files Name: python-%{pypi_name} Version: 0.12.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An SDK for building applications to work with OpenStack License: ASL 2.0 @@ -35,8 +35,7 @@ BuildRequires: git %description %{common_desc} -# FIXME(jpena): we will disable python2 subpackages completely in the future -#%if %{with python2} +%if %{with python2} %package -n python2-%{pypi_name} Summary: An SDK for building applications to work with OpenStack %{?python_provide:%python_provide python2-%{pypi_name}} @@ -110,7 +109,6 @@ Requires: PyYAML %description -n python2-%{pypi_name} %{common_desc} -%if %{with python2} %package -n python2-%{pypi_name}-tests Summary: An SDK for building applications to work with OpenStack - test files @@ -201,9 +199,9 @@ clouds - documentation. rm -rf {,test-}requirements.txt %build -#%if %{with python2} +%if %{with python2} %py2_build -#%endif +%endif %if %{with python3} %py3_build @@ -222,9 +220,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %install -#%if %{with python2} +%if %{with python2} %py2_install -#%endif +%endif %if %{with python3} %{py3_install} @@ -238,18 +236,15 @@ rm -rf .testrepository # stestr-3 --test-path ./openstack/tests/unit run %endif -#%if %{with python2} +%if %{with python2} %files -n python2-%{pypi_name} %doc README.rst %license LICENSE -%if %{without python3} %{_bindir}/openstack-inventory -%endif %{python2_sitelib}/openstack %{python2_sitelib}/%{pypi_name}-*.egg-info %exclude %{python2_sitelib}/openstack/tests -%if %{with python2} %files -n python2-%{pypi_name}-tests %{python2_sitelib}/openstack/tests %endif @@ -274,6 +269,9 @@ rm -rf .testrepository %endif %changelog +* Thu Jan 31 2019 Yatin Karel - 0.12.0-6 +- Remove python2 sub package, no other package needs it now (#1629753) + * Wed Sep 19 2018 Javier Peña - 0.12.0-5 - Re-enable python2-openstacksdk in Fedora30+, still needed by some other packages