From 40177cdbcf3f0da28224a13ca8fd502e61484465 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Fri, 8 Mar 2019 15:55:36 -0500
Subject: [PATCH] Fix package versions of openstack clients

Our openstack clients are now based upon the master branch.
The rpm packaging version should reflect the latest tagged version,
as can be discovered by `git describe`.  The actual packaging
has fallen well behind that target.

This update will correct the rpm packaging.

Also the current packaging does not advance as new commits are
delivered to master.  I propose to use the TIS_BASE_SRCREV
mechanism to count commits passed the tag.

Now this is not ideal as it result in packages looking like this
 -- python-cinderclient-4.1.0-1.tis.33.src.rpm --
which may seem to imply that tis has authored 33 patches upon
python-cinderclient.  We are indeed 33 patches beyond tag
4.1.0 (as of this writing), but it is upstream revisions and
not stx (tis) revisions that are being counted.

We may want further build tool work to implement a second
revision counting mechanism to separate upstream revisions
from stx revisions.

Story: 2004751
Task: 28864
Change-Id: I90fa12084cef1faee52b38c328df078d2f18a001
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 openstack/python-aodhclient/centos/build_srpm.data             | 3 ++-
 openstack/python-aodhclient/centos/python-aodhclient.spec      | 2 +-
 openstack/python-barbicanclient/centos/build_srpm.data         | 3 ++-
 .../python-barbicanclient/centos/python-barbicanclient.spec    | 2 +-
 openstack/python-cinderclient/centos/build_srpm.data           | 3 ++-
 openstack/python-cinderclient/centos/python-cinderclient.spec  | 2 +-
 openstack/python-glanceclient/centos/build_srpm.data           | 3 ++-
 openstack/python-glanceclient/centos/python-glanceclient.spec  | 2 +-
 openstack/python-gnocchiclient/centos/build_srpm.data          | 3 ++-
 openstack/python-heatclient/centos/build_srpm.data             | 3 ++-
 openstack/python-heatclient/centos/python-heatclient.spec      | 2 +-
 openstack/python-ironicclient/centos/build_srpm.data           | 3 ++-
 openstack/python-ironicclient/centos/python-ironicclient.spec  | 2 +-
 openstack/python-keystoneclient/centos/build_srpm.data         | 3 ++-
 .../python-keystoneclient/centos/python-keystoneclient.spec    | 2 +-
 openstack/python-magnumclient/centos/build_srpm.data           | 3 ++-
 openstack/python-magnumclient/centos/python-magnumclient.spec  | 2 +-
 openstack/python-neutronclient/centos/build_srpm.data          | 3 ++-
 .../python-neutronclient/centos/python-neutronclient.spec      | 2 +-
 openstack/python-novaclient/centos/build_srpm.data             | 3 ++-
 openstack/python-novaclient/centos/python-novaclient.spec      | 2 +-
 openstack/python-openstackclient/centos/build_srpm.data        | 3 ++-
 .../python-openstackclient/centos/python-openstackclient.spec  | 2 +-
 openstack/python-openstacksdk/centos/build_srpm.data           | 3 ++-
 openstack/python-openstacksdk/centos/python-openstacksdk.spec  | 2 +-
 openstack/python-pankoclient/centos/build_srpm.data            | 3 ++-
 26 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/openstack/python-aodhclient/centos/build_srpm.data b/openstack/python-aodhclient/centos/build_srpm.data
index b69c6a4e..63358a75 100644
--- a/openstack/python-aodhclient/centos/build_srpm.data
+++ b/openstack/python-aodhclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=aodhclient
 SRC_DIR=$CGCS_BASE/git/python-aodhclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="1.2.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-aodhclient/centos/python-aodhclient.spec b/openstack/python-aodhclient/centos/python-aodhclient.spec
index 7b04fea1..5e405723 100644
--- a/openstack/python-aodhclient/centos/python-aodhclient.spec
+++ b/openstack/python-aodhclient/centos/python-aodhclient.spec
@@ -11,7 +11,7 @@ This is a client library for Aodh built on the Aodh API. It \
 provides a Python API (the aodhclient module) and a command-line tool.
 
 Name:             python-aodhclient
-Version:          1.1.1
+Version:          1.2.0
 Release:          1%{?_tis_dist}.%{tis_patch_ver}
 Summary:          Python API and CLI for OpenStack Aodh
 
diff --git a/openstack/python-barbicanclient/centos/build_srpm.data b/openstack/python-barbicanclient/centos/build_srpm.data
index 000289a6..fe4a7c79 100644
--- a/openstack/python-barbicanclient/centos/build_srpm.data
+++ b/openstack/python-barbicanclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=python-barbicanclient
 SRC_DIR=$CGCS_BASE/git/python-barbicanclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="4.8.1"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-barbicanclient/centos/python-barbicanclient.spec b/openstack/python-barbicanclient/centos/python-barbicanclient.spec
index ffd3b4e9..bf06f6c5 100644
--- a/openstack/python-barbicanclient/centos/python-barbicanclient.spec
+++ b/openstack/python-barbicanclient/centos/python-barbicanclient.spec
@@ -11,7 +11,7 @@ Python library for accessing the API (barbicanclient module), and \
 a command-line script (barbican).
 
 Name:           python-barbicanclient
-Version:        4.7.1
+Version:        4.8.1
 Release:        1%{?_tis_dist}.%{tis_patch_ver}
 Summary:        Client Library for OpenStack Barbican Key Management API
 
diff --git a/openstack/python-cinderclient/centos/build_srpm.data b/openstack/python-cinderclient/centos/build_srpm.data
index 7d37ac08..f9604a6f 100644
--- a/openstack/python-cinderclient/centos/build_srpm.data
+++ b/openstack/python-cinderclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=python-cinderclient
 SRC_DIR=$CGCS_BASE/git/python-cinderclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="4.1.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-cinderclient/centos/python-cinderclient.spec b/openstack/python-cinderclient/centos/python-cinderclient.spec
index 3442aed9..bbd4e5ce 100644
--- a/openstack/python-cinderclient/centos/python-cinderclient.spec
+++ b/openstack/python-cinderclient/centos/python-cinderclient.spec
@@ -10,7 +10,7 @@ Client library (cinderclient python module) and command line utility \
 (cinder) for interacting with OpenStack Cinder (Block Storage) API.
 
 Name:             python-cinderclient
-Version:          4.0.1
+Version:          4.1.0
 Release:          1%{?_tis_dist}.%{tis_patch_ver}
 Summary:          Python API and CLI for OpenStack Cinder
 
diff --git a/openstack/python-glanceclient/centos/build_srpm.data b/openstack/python-glanceclient/centos/build_srpm.data
index de9280c0..7a5bf4d1 100644
--- a/openstack/python-glanceclient/centos/build_srpm.data
+++ b/openstack/python-glanceclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=python-glanceclient
 SRC_DIR="$CGCS_BASE/git/python-glanceclient"
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="2.16.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-glanceclient/centos/python-glanceclient.spec b/openstack/python-glanceclient/centos/python-glanceclient.spec
index cd822310..b7cc4e67 100644
--- a/openstack/python-glanceclient/centos/python-glanceclient.spec
+++ b/openstack/python-glanceclient/centos/python-glanceclient.spec
@@ -14,7 +14,7 @@ glanceclient module), and a command-line script (glance). Each implements \
 
 Name:             python-glanceclient
 Epoch:            1
-Version:          2.13.1
+Version:          2.16.0
 Release:          1%{?_tis_dist}.%{tis_patch_ver}
 Summary:          Python API and CLI for OpenStack Glance
 
diff --git a/openstack/python-gnocchiclient/centos/build_srpm.data b/openstack/python-gnocchiclient/centos/build_srpm.data
index 2ac72bf0..a510be27 100644
--- a/openstack/python-gnocchiclient/centos/build_srpm.data
+++ b/openstack/python-gnocchiclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=gnocchiclient
 SRC_DIR=$CGCS_BASE/git/python-gnocchiclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="7.0.4"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-heatclient/centos/build_srpm.data b/openstack/python-heatclient/centos/build_srpm.data
index a78058ee..3f6e54bb 100644
--- a/openstack/python-heatclient/centos/build_srpm.data
+++ b/openstack/python-heatclient/centos/build_srpm.data
@@ -1,4 +1,5 @@
 TAR_NAME=python-heatclient
 SRC_DIR=$CGCS_BASE/git/python-heatclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="1.17.0"
+TIS_PATCH_VER=GITREVCOUNT
 
diff --git a/openstack/python-heatclient/centos/python-heatclient.spec b/openstack/python-heatclient/centos/python-heatclient.spec
index dd4e30a1..82395fec 100644
--- a/openstack/python-heatclient/centos/python-heatclient.spec
+++ b/openstack/python-heatclient/centos/python-heatclient.spec
@@ -14,7 +14,7 @@ heatclient module), and a command-line script (heat). Each implements 100% of \
 the OpenStack Heat API.
 
 Name:    python-heatclient
-Version: 1.16.1
+Version: 1.17.0
 Release: 1%{?_tis_dist}.%{tis_patch_ver}
 Summary: Python API and CLI for OpenStack Heat
 
diff --git a/openstack/python-ironicclient/centos/build_srpm.data b/openstack/python-ironicclient/centos/build_srpm.data
index dec438d1..c6f72766 100644
--- a/openstack/python-ironicclient/centos/build_srpm.data
+++ b/openstack/python-ironicclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME="python-ironicclient"
 SRC_DIR="$CGCS_BASE/git/python-ironicclient"
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="2.7.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-ironicclient/centos/python-ironicclient.spec b/openstack/python-ironicclient/centos/python-ironicclient.spec
index ed2aa9b7..a656271e 100644
--- a/openstack/python-ironicclient/centos/python-ironicclient.spec
+++ b/openstack/python-ironicclient/centos/python-ironicclient.spec
@@ -9,7 +9,7 @@
 %global common_desc A python and command line client library for Ironic
 
 Name:           python-ironicclient
-Version:        2.5.0
+Version:        2.7.0
 Release:        1%{?_tis_dist}.%{tis_patch_ver}
 Summary:        Python client for Ironic
 
diff --git a/openstack/python-keystoneclient/centos/build_srpm.data b/openstack/python-keystoneclient/centos/build_srpm.data
index 2aaf1fbb..d54a1b99 100644
--- a/openstack/python-keystoneclient/centos/build_srpm.data
+++ b/openstack/python-keystoneclient/centos/build_srpm.data
@@ -1,4 +1,5 @@
 TAR_NAME=python-keystoneclient
 SRC_DIR=$CGCS_BASE/git/python-keystoneclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="3.19.0"
+TIS_PATCH_VER=GITREVCOUNT
 
diff --git a/openstack/python-keystoneclient/centos/python-keystoneclient.spec b/openstack/python-keystoneclient/centos/python-keystoneclient.spec
index 82f73902..9cf0d241 100644
--- a/openstack/python-keystoneclient/centos/python-keystoneclient.spec
+++ b/openstack/python-keystoneclient/centos/python-keystoneclient.spec
@@ -10,7 +10,7 @@ Identity API.
 
 Name:       python-keystoneclient
 Epoch:      1
-Version:    3.17.0
+Version:    3.19.0
 Release:    1%{?_tis_dist}.%{tis_patch_ver}
 Summary:    Client library for OpenStack Identity API
 License:    ASL 2.0
diff --git a/openstack/python-magnumclient/centos/build_srpm.data b/openstack/python-magnumclient/centos/build_srpm.data
index 6c0a4387..c73da696 100644
--- a/openstack/python-magnumclient/centos/build_srpm.data
+++ b/openstack/python-magnumclient/centos/build_srpm.data
@@ -1,4 +1,5 @@
 TAR_NAME="python-magnumclient"
 SRC_DIR="$CGCS_BASE/git/python-magnumclient"
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="2.12.0"
+TIS_PATCH_VER=GITREVCOUNT
 
diff --git a/openstack/python-magnumclient/centos/python-magnumclient.spec b/openstack/python-magnumclient/centos/python-magnumclient.spec
index d5c2071a..129b6717 100644
--- a/openstack/python-magnumclient/centos/python-magnumclient.spec
+++ b/openstack/python-magnumclient/centos/python-magnumclient.spec
@@ -17,7 +17,7 @@ command-line tool (magnum).
 %global common_desc_tests Python-magnumclient test subpackage
 
 Name:           python-%{pname}
-Version:        2.10.0
+Version:        2.12.0
 Release:        1%{?_tis_dist}.%{tis_patch_ver}
 Summary:        Client library for Magnum API
 
diff --git a/openstack/python-neutronclient/centos/build_srpm.data b/openstack/python-neutronclient/centos/build_srpm.data
index 8d95970d..94ef6291 100644
--- a/openstack/python-neutronclient/centos/build_srpm.data
+++ b/openstack/python-neutronclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=python-neutronclient
 SRC_DIR="$CGCS_BASE/git/python-neutronclient"
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="6.12.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-neutronclient/centos/python-neutronclient.spec b/openstack/python-neutronclient/centos/python-neutronclient.spec
index e2eabe7a..8c92d321 100644
--- a/openstack/python-neutronclient/centos/python-neutronclient.spec
+++ b/openstack/python-neutronclient/centos/python-neutronclient.spec
@@ -11,7 +11,7 @@ Client library and command line utility for interacting with OpenStack \
 Neutron's API.
 
 Name:       python-neutronclient
-Version:    6.9.1
+Version:    6.12.0
 Release:    1%{?_tis_dist}.%{tis_patch_ver}
 Summary:    Python API and CLI for OpenStack Neutron
 
diff --git a/openstack/python-novaclient/centos/build_srpm.data b/openstack/python-novaclient/centos/build_srpm.data
index b1c697d3..552da58a 100644
--- a/openstack/python-novaclient/centos/build_srpm.data
+++ b/openstack/python-novaclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=python-novaclient
 SRC_DIR=$CGCS_BASE/git/python-novaclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="13.0.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-novaclient/centos/python-novaclient.spec b/openstack/python-novaclient/centos/python-novaclient.spec
index 38459011..eb161f43 100644
--- a/openstack/python-novaclient/centos/python-novaclient.spec
+++ b/openstack/python-novaclient/centos/python-novaclient.spec
@@ -14,7 +14,7 @@ the OpenStack Nova API.
 
 Name:             python-novaclient
 Epoch:            1
-Version:          11.0.0
+Version:          13.0.0
 Release:          1%{?_tis_dist}.%{tis_patch_ver}
 Summary:          Python API and CLI for OpenStack Nova
 License:          ASL 2.0
diff --git a/openstack/python-openstackclient/centos/build_srpm.data b/openstack/python-openstackclient/centos/build_srpm.data
index 49716585..df27d25b 100644
--- a/openstack/python-openstackclient/centos/build_srpm.data
+++ b/openstack/python-openstackclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=python-openstackclient
 SRC_DIR="$CGCS_BASE/git/python-openstackclient"
-TIS_PATCH_VER=2
+TIS_BASE_SRCREV="3.18.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-openstackclient/centos/python-openstackclient.spec b/openstack/python-openstackclient/centos/python-openstackclient.spec
index 60b969fc..0ba6d0c3 100644
--- a/openstack/python-openstackclient/centos/python-openstackclient.spec
+++ b/openstack/python-openstackclient/centos/python-openstackclient.spec
@@ -16,7 +16,7 @@ It is a thin wrapper to the stock python-*client modules that implement the \
 actual REST API client actions.
 
 Name:             python-openstackclient
-Version:          3.16.2
+Version:          3.18.0
 Release:          1%{?_tis_dist}.%{tis_patch_ver}
 Summary:          OpenStack Command-line Client
 
diff --git a/openstack/python-openstacksdk/centos/build_srpm.data b/openstack/python-openstacksdk/centos/build_srpm.data
index 59c953f0..6ad7c9d5 100644
--- a/openstack/python-openstacksdk/centos/build_srpm.data
+++ b/openstack/python-openstacksdk/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=openstacksdk
 SRC_DIR="$CGCS_BASE/git/python-openstacksdk"
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="0.25.0"
+TIS_PATCH_VER=GITREVCOUNT
diff --git a/openstack/python-openstacksdk/centos/python-openstacksdk.spec b/openstack/python-openstacksdk/centos/python-openstacksdk.spec
index ce2f9280..5a9ae7cc 100644
--- a/openstack/python-openstacksdk/centos/python-openstacksdk.spec
+++ b/openstack/python-openstacksdk/centos/python-openstacksdk.spec
@@ -20,7 +20,7 @@ A collection of libraries for building applications to work with OpenStack \
 clouds - test files
 
 Name:           python-%{pypi_name}
-Version:        0.17.2
+Version:        0.25.0
 Release:        1%{?_tis_dist}.%{tis_patch_ver}
 Summary:        An SDK for building applications to work with OpenStack
 
diff --git a/openstack/python-pankoclient/centos/build_srpm.data b/openstack/python-pankoclient/centos/build_srpm.data
index 8bc4cc31..328b34a8 100644
--- a/openstack/python-pankoclient/centos/build_srpm.data
+++ b/openstack/python-pankoclient/centos/build_srpm.data
@@ -1,3 +1,4 @@
 TAR_NAME=pankoclient
 SRC_DIR=$CGCS_BASE/git/python-pankoclient
-TIS_PATCH_VER=0
+TIS_BASE_SRCREV="0.5.0"
+TIS_PATCH_VER=GITREVCOUNT