CentOS 8: python-novaclient should use python3
Change python to python3 Change-Id: I9f442278bfc721025f5ec151a7df3d4ef5db3f95 Story: 2006729 Task: 38649 Signed-off-by: Yong Fu <fuyong@neusoft.com>
This commit is contained in:
Yong Fu
parent
aa101f9768
commit
2201c17252
|
|
@ -1,11 +1,19 @@
|
|||
# Macros for py2/py3 compatibility
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%global pyver %{python3_pkgversion}
|
||||
%else
|
||||
%global pyver 2
|
||||
%endif
|
||||
%global pyver_bin python%{pyver}
|
||||
%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
|
||||
%global pyver_install %{expand:%{py%{pyver}_install}}
|
||||
%global pyver_build %{expand:%{py%{pyver}_build}}
|
||||
%global pyver_build_wheel %{expand:%{py%{pyver}_build_wheel}}
|
||||
# End of macros for py2/py3 compatibility
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname novaclient
|
||||
%global with_doc 0
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
%global with_doc 1
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Nova API. There's a Python API (the \
|
||||
|
|
@ -15,7 +23,7 @@ the OpenStack Nova API.
|
|||
Name: python-novaclient
|
||||
Epoch: 1
|
||||
Version: 15.1.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Release: 1.el8%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/%{name}
|
||||
|
|
@ -28,65 +36,47 @@ BuildRequires: openstack-macros
|
|||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
%package -n python%{pyver}-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
%{?python_provide:%python_provide python2-novaclient}
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
|
||||
Requires: python2-babel >= 2.3.4
|
||||
Requires: python2-iso8601 >= 0.1.11
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr >= 2.0.0
|
||||
Requires: python2-prettytable >= 0.7.2
|
||||
Requires: python-simplejson >= 3.5.1
|
||||
Requires: python2-six >= 1.10.0
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
%{?python_provide:%python_provide python3-novaclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
Requires: python3-babel >= 2.3.4
|
||||
Requires: python3-iso8601 >= 0.1.11
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr >= 2.0.0
|
||||
Requires: python3-prettytable >= 0.7.2
|
||||
Requires: python3-simplejson >= 3.5.1
|
||||
Requires: python3-six >= 1.10.0
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%{?python_provide:%python_provide python%{pyver}-novaclient}
|
||||
%if %{pyver} == 3
|
||||
Obsoletes: python2-%{sname} < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
BuildRequires: python%{pyver}-devel
|
||||
BuildRequires: python%{pyver}-pbr
|
||||
BuildRequires: python%{pyver}-setuptools
|
||||
|
||||
Requires: python%{pyver}-babel >= 2.3.4
|
||||
Requires: python%{pyver}-iso8601 >= 0.1.11
|
||||
Requires: python%{pyver}-keystoneauth1 >= 3.5.0
|
||||
Requires: python%{pyver}-oslo-i18n >= 3.15.3
|
||||
Requires: python%{pyver}-oslo-serialization >= 2.18.0
|
||||
Requires: python%{pyver}-oslo-utils >= 3.33.0
|
||||
Requires: python%{pyver}-pbr >= 2.0.0
|
||||
Requires: python%{pyver}-prettytable >= 0.7.2
|
||||
Requires: python%{pyver}-six >= 1.10.0
|
||||
# Handle python2 exception
|
||||
%if %{pyver} == 2
|
||||
Requires: python-simplejson >= 3.5.1
|
||||
%else
|
||||
Requires: python%{pyver}-simplejson >= 3.5.1
|
||||
%endif
|
||||
|
||||
%description -n python%{pyver}-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Nova API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-prettytable
|
||||
BuildRequires: python2-sphinxcontrib-apidoc
|
||||
BuildRequires: python%{pyver}-sphinx
|
||||
BuildRequires: python%{pyver}-sphinxcontrib-apidoc
|
||||
BuildRequires: python%{pyver}-openstackdocstheme
|
||||
BuildRequires: python%{pyver}-oslo-utils
|
||||
BuildRequires: python%{pyver}-keystoneauth1
|
||||
BuildRequires: python%{pyver}-oslo-serialization
|
||||
BuildRequires: python%{pyver}-prettytable
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
|
@ -101,78 +91,45 @@ This package contains auto-generated documentation.
|
|||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
%{pyver_build}
|
||||
%{pyver_build_wheel}
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python3_version}
|
||||
ln -s ./nova-%{python3_version} %{buildroot}%{_bindir}/nova-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/novaclient/tests
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python2_version}
|
||||
ln -s ./nova-%{python2_version} %{buildroot}%{_bindir}/nova-2
|
||||
|
||||
ln -s ./nova-2 %{buildroot}%{_bindir}/nova
|
||||
%{pyver_install}
|
||||
# Create a versioned binary for backwards compatibility until everything is pure py3
|
||||
ln -s nova %{buildroot}%{_bindir}/nova-%{pyver}
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/nova.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/nova
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/novaclient/tests
|
||||
rm -fr %{buildroot}%{pyver_sitelib}/novaclient/tests
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%{__python2} setup.py build_sphinx -b html
|
||||
# generate man page
|
||||
sphinx-build -b man doc/source doc/build/man
|
||||
sphinx-build-%{pyver} -b html doc/source doc/build/html
|
||||
sphinx-build-%{pyver} -b man doc/source doc/build/man
|
||||
|
||||
install -p -D -m 644 doc/build/man/nova.1 %{buildroot}%{_mandir}/man1/nova.1
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo doc/build/html/.htaccess
|
||||
%endif
|
||||
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%files -n python%{pyver}-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python2_sitelib}/%{sname}
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{pyver_sitelib}/%{sname}
|
||||
%{pyver_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/nova.1.gz
|
||||
%endif
|
||||
%{_bindir}/nova
|
||||
%{_bindir}/nova-2
|
||||
%{_bindir}/nova-%{python2_version}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/nova.1.gz
|
||||
%endif
|
||||
%{_bindir}/nova-3
|
||||
%{_bindir}/nova-%{python3_version}
|
||||
%endif
|
||||
%{_bindir}/nova-%{pyver}
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files doc
|
||||
|
|
@ -189,8 +146,7 @@ Contains python wheels for %{name}
|
|||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 1:11.0.0-1
|
||||
- Update to 11.0.0
|
||||
* Thu Sep 19 2019 RDO <dev@lists.rdoproject.org> 1:15.1.0-1
|
||||
- Update to 15.1.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue