From 66d9e3facb3df1b3eba2039e03d0a4ce2d8d3f93 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Nov 07 2018 12:57:48 +0000 Subject: Subpackage python2-openstackclient has been removed --- diff --git a/python-openstackclient.spec b/python-openstackclient.spec index ac6721f..b878c0c 100644 --- a/python-openstackclient.spec +++ b/python-openstackclient.spec @@ -2,15 +2,12 @@ # Python3 support in OpenStack starts with version 3.5, # which is only in Fedora 24+ -%if 0%{?fedora} >= 24 -%global with_python3 1 -%endif %global client openstackclient Name: python-openstackclient Version: 3.14.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OpenStack Command-line Client License: ASL 2.0 @@ -24,69 +21,11 @@ python-openstackclient is a unified command-line client for the OpenStack APIs. It is a thin wrapper to the stock python-*client modules that implement the actual REST API client actions. -%package -n python2-%{client} -Summary: OpenStack Command-line Client -%{?python_provide:%python_provide python2-%{client}} - -BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-pbr -BuildRequires: python-d2to1 -BuildRequires: git -BuildRequires: python-six -BuildRequires: python-cliff -BuildRequires: python-oslo-i18n -BuildRequires: python-oslo-utils -BuildRequires: python-simplejson -BuildRequires: python-requests -BuildRequires: python-glanceclient -BuildRequires: python-keystoneclient -BuildRequires: python-novaclient -BuildRequires: python-cinderclient -BuildRequires: python-neutronclient -BuildRequires: python-mock -BuildRequires: python-requests-mock -BuildRequires: python-os-client-config -# Required to compile translation files -BuildRequires: python-babel -# Required for unit tests -BuildRequires: python-os-testr -BuildRequires: python2-osc-lib-tests -BuildRequires: python-coverage -BuildRequires: python-fixtures -BuildRequires: python-oslotest -BuildRequires: python-reno -BuildRequires: python-requestsexceptions -BuildRequires: python-openstacksdk -BuildRequires: python-osprofiler - -Requires: python-pbr -Requires: python-babel -Requires: python-cliff -Requires: python-openstacksdk >= 0.9.17 -Requires: python-oslo-i18n >= 2.1.0 -Requires: python-oslo-utils >= 3.20.0 -Requires: python-glanceclient >= 1:2.8.0 -Requires: python-keystoneauth1 >= 3.1.0 -Requires: python-keystoneclient >= 1:3.8.0 -Requires: python-novaclient >= 1:9.0.0 -Requires: python-cinderclient >= 3.1.0 -Requires: python-neutronclient >= 6.3.0 -Requires: python-six >= 1.9.0 -Requires: python-osc-lib >= 1.7.0 -Requires: python-%{client}-lang = %{version}-%{release} - - -%description -n python2-%{client} -python-openstackclient is a unified command-line client for the OpenStack APIs. -It is a thin wrapper to the stock python-*client modules that implement the -actual REST API client actions. - %package -n python-%{client}-doc Summary: Documentation for OpenStack Command-line Client -BuildRequires: python-sphinx -BuildRequires: python-openstackdocstheme +BuildRequires: python3-sphinx +BuildRequires: python3-openstackdocstheme Requires: %{name} = %{version}-%{release} @@ -103,7 +42,6 @@ Summary: Translation files for Openstackclient %description -n python-%{client}-lang Translation files for Openstackclient -%if 0%{?with_python3} %package -n python3-%{client} Summary: OpenStack Command-line Client %{?python_provide:%python_provide python3-%{client}} @@ -160,7 +98,6 @@ Requires: python-%{client}-lang = %{version}-%{release} python-openstackclient is a unified command-line client for the OpenStack APIs. It is a thin wrapper to the stock python-*client modules that implement the actual REST API client actions. -%endif %prep %autosetup -n %{name}-%{upstream_version} -S git @@ -169,25 +106,16 @@ actual REST API client actions. rm -rf requirements.txt test-requirements.txt %build -%py2_build -# Generate i18n files -%{__python2} setup.py compile_catalog -d build/lib/openstackclient/locale - -%if 0%{?with_python3} %py3_build -%endif +# Generate i18n files +%{__python3} setup.py compile_catalog -d build/lib/openstackclient/locale %install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} - -%if 0%{?with_python3} -rm -rf %{buildroot}%{_bindir}/* %py3_install -%endif -sphinx-build -b html doc/source doc/build/html -sphinx-build -b man doc/source doc/build/man +sphinx-build-3 -b html doc/source doc/build/html +sphinx-build-3 -b man doc/source doc/build/man install -p -D -m 644 doc/build/man/openstack.1 %{buildroot}%{_mandir}/man1/openstack.1 @@ -196,34 +124,17 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo # Install i18n .mo files (.po and .pot are not required) install -d -m 755 %{buildroot}%{_datadir} -rm -f %{buildroot}%{python2_sitelib}/openstackclient/locale/*/LC_*/openstackclient*po -rm -f %{buildroot}%{python2_sitelib}/openstackclient/locale/*pot -mv %{buildroot}%{python2_sitelib}/openstackclient/locale %{buildroot}%{_datadir}/locale - -%if 0%{?with_python3} -rm -rf %{buildroot}%{python3_sitelib}/openstackclient/locale -%endif +rm -f %{buildroot}%{python3_sitelib}/openstackclient/locale/*/LC_*/openstackclient*po +rm -f %{buildroot}%{python3_sitelib}/openstackclient/locale/*pot +mv %{buildroot}%{python3_sitelib}/openstackclient/locale %{buildroot}%{_datadir}/locale # Find language files %find_lang openstackclient --all-name %check -PYTHON=python2 %{__python2} setup.py test -%if 0%{?with_python3} rm -rf .testrepository # NOTE(jpena): We are getting some test failures with Python 3.7. Ignore while we figure out the reason PYTHON=python3 %{__python3} setup.py test || true -%endif - -%files -n python2-%{client} -%license LICENSE -%doc README.rst -%{python2_sitelib}/openstackclient -%{python2_sitelib}/*.egg-info -%if ! 0%{?with_python3} -%{_bindir}/openstack -%{_mandir}/man1/openstack.1* -%endif %files -n python-%{client}-doc %license LICENSE @@ -232,7 +143,6 @@ PYTHON=python3 %{__python3} setup.py test || true %files -n python-%{client}-lang -f openstackclient.lang %license LICENSE -%if 0%{?with_python3} %files -n python3-%{client} %license LICENSE %doc README.rst @@ -240,9 +150,12 @@ PYTHON=python3 %{__python3} setup.py test || true %{_mandir}/man1/openstack.1* %{python3_sitelib}/openstackclient %{python3_sitelib}/*.egg-info -%endif %changelog +* Wed Nov 07 2018 Miro Hrončok - 3.14.1-6 +- Subpackage python2-openstackclient has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Wed Sep 19 2018 Miro Hrončok - 3.14.1-5 - Only ship one /usr/bin/openstack