diff --git a/python-saharaclient.spec b/python-saharaclient.spec index 4faa5f7..b35409c 100644 --- a/python-saharaclient.spec +++ b/python-saharaclient.spec @@ -1,13 +1,10 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global sname saharaclient -%if 0%{?fedora} -%global with_python3 1 -%endif Name: python-saharaclient Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Client library for OpenStack Sahara API License: ASL 2.0 URL: https://launchpad.net/sahara @@ -18,32 +15,6 @@ BuildArch: noarch %description Python client library for interacting with OpenStack Sahara API. -%package -n python2-%{sname} -Summary: Client library for OpenStack Sahara API -BuildRequires: python2-setuptools -BuildRequires: python2-devel -BuildRequires: python-d2to1 -BuildRequires: python2-pbr >= 2.0.0 - -Requires: python2-babel >= 2.3.4 -Requires: python2-keystoneauth1 >= 3.3.0 -Requires: python2-openstackclient >= 3.12.0 -Requires: python2-osc-lib >= 1.8.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-pbr -Requires: python2-requests >= 2.14.2 -Requires: python2-six >= 1.10.0 - - -%{?python_provide:%python_provide python2-%{sname}} - -%description -n python2-%{sname} -Python client library for interacting with OpenStack Sahara API. - -%if 0%{?with_python3} %package -n python3-%{sname} Summary: Client library for OpenStack Sahara API BuildRequires: python3-setuptools @@ -67,7 +38,6 @@ Requires: python3-six >= 1.10.0 %description -n python3-%{sname} Python client library for interacting with OpenStack Sahara API. -%endif %prep @@ -78,18 +48,11 @@ rm -rf {,test-}requirements.txt %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif %install -%if 0%{?with_python3} %py3_install -%endif - -%py2_install %check # Building on koji with virtualenv requires test-requirements.txt and this @@ -98,22 +61,18 @@ rm -rf {,test-}requirements.txt # TODO mimccune fix up unittests # sh run_tests.sh --no-virtual-env --no-pep8 -%files -n python2-%{sname} -%license LICENSE -%doc ChangeLog README.rst HACKING.rst -%{python2_sitelib}/saharaclient -%{python2_sitelib}/*.egg-info - -%if 0%{?with_python3} %files -n python3-%{sname} %license LICENSE %doc ChangeLog README.rst HACKING.rst %{python3_sitelib}/saharaclient %{python3_sitelib}/*.egg-info -%endif %changelog +* Sat Oct 27 2018 Miro HronĨok - 1.5.0-2 +- Subpackage python2-saharaclient has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Tue Feb 13 2018 RDO 1.5.0-1 - Update to 1.5.0