From b6e3badac62686a14a0d837d2677feccfa1dfd70 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 4 Feb 2019 11:59:06 -0600 Subject: [PATCH] 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 --- openstack/python-cinderclient/centos/python-cinderclient.spec | 3 +++ openstack/python-glanceclient/centos/python-glanceclient.spec | 1 + 2 files changed, 4 insertions(+) diff --git a/openstack/python-cinderclient/centos/python-cinderclient.spec b/openstack/python-cinderclient/centos/python-cinderclient.spec index 6662a44e..3442aed9 100644 --- a/openstack/python-cinderclient/centos/python-cinderclient.spec +++ b/openstack/python-cinderclient/centos/python-cinderclient.spec @@ -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} diff --git a/openstack/python-glanceclient/centos/python-glanceclient.spec b/openstack/python-glanceclient/centos/python-glanceclient.spec index dc3013b7..cd822310 100644 --- a/openstack/python-glanceclient/centos/python-glanceclient.spec +++ b/openstack/python-glanceclient/centos/python-glanceclient.spec @@ -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}