Fix the version string in cinder and glance clients

cinderclient was showing 0.0.0 for cinder --version
Same problem for glance.

The pbr version needed to be set when building from
outside of a git tree.

All other clients had this set properly.

This bug was introduced when the new stein clients were
added.

The cinderclient also needed some BuildRequires updated.
These BuildRequires were for building wheels.

Closes-Bug: 1814573
Change-Id: I4afe783e25ab2172ae999787e6b0e3ec91f78419
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-02-04 11:59:06 -06:00
parent 1a1dddffe4
commit b6e3badac6
2 changed files with 4 additions and 0 deletions

View File

@ -31,6 +31,8 @@ Summary: Python API and CLI for OpenStack Cinder
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python2-pbr
%if 0%{?fedora} > 0
BuildRequires: python2-d2to1
@ -120,6 +122,7 @@ sphinx-build -W -b man doc/source doc/build/man
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
%install
export PBR_VERSION=%{version}
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/cinder %{buildroot}%{_bindir}/cinder-%{python3_version}

View File

@ -120,6 +120,7 @@ export PBR_VERSION=%{version}
%endif
%install
export PBR_VERSION=%{version}
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python3_version}