diff --git a/openstack/python-cinderclient/python-cinderclient.spec.j2 b/openstack/python-cinderclient/python-cinderclient.spec.j2
index 6016fbc7f..ac2698b4b 100644
--- a/openstack/python-cinderclient/python-cinderclient.spec.j2
+++ b/openstack/python-cinderclient/python-cinderclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-cinderclient' %}
-{% set upstream_version = upstream_version('6.0.0') %}
+{% set upstream_version = upstream_version('7.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2 b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
index 7de315588..8b77870db 100644
--- a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
+++ b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-cloudkittyclient' %}
-{% set upstream_version = upstream_version('3.1.0') %}
+{% set upstream_version = upstream_version('4.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -68,6 +68,7 @@ Summary:        Documentation for OpenStack Cloudkitty API client libary
 Group:          Documentation/HTML
 BuildRequires:  {{ py3('Sphinx') }}
 BuildRequires:  {{ py3('openstackdocstheme') }}
+BuildRequires:  {{ py3('sphinxcontrib-svg2pdfconverter') }}
 
 %description -n {{ py2name() }}-doc
 This is a client library for CloudKitty built on the CloudKitty API.
diff --git a/openstack/python-congressclient/python-congressclient.spec.j2 b/openstack/python-congressclient/python-congressclient.spec.j2
index 79be419c8..adac98e85 100644
--- a/openstack/python-congressclient/python-congressclient.spec.j2
+++ b/openstack/python-congressclient/python-congressclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-congressclient' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 Name:           {{ py2name() }}
diff --git a/openstack/python-designateclient/python-designateclient.spec.j2 b/openstack/python-designateclient/python-designateclient.spec.j2
index a92ea1086..e93bb8cb5 100644
--- a/openstack/python-designateclient/python-designateclient.spec.j2
+++ b/openstack/python-designateclient/python-designateclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-designateclient' %}
-{% set upstream_version = upstream_version('3.1.0') %}
+{% set upstream_version = upstream_version('4.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-freezerclient/python-freezerclient.spec.j2 b/openstack/python-freezerclient/python-freezerclient.spec.j2
index dfea373f6..c480da841 100644
--- a/openstack/python-freezerclient/python-freezerclient.spec.j2
+++ b/openstack/python-freezerclient/python-freezerclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-freezerclient' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('3.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-glanceclient/python-glanceclient.spec.j2 b/openstack/python-glanceclient/python-glanceclient.spec.j2
index d5d2dd981..681f27a9d 100644
--- a/openstack/python-glanceclient/python-glanceclient.spec.j2
+++ b/openstack/python-glanceclient/python-glanceclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-glanceclient' %}
-{% set upstream_version = upstream_version('2.17.0') %}
+{% set upstream_version = upstream_version('3.1.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-heatclient/python-heatclient.spec.j2 b/openstack/python-heatclient/python-heatclient.spec.j2
index a09920051..2eef5748d 100644
--- a/openstack/python-heatclient/python-heatclient.spec.j2
+++ b/openstack/python-heatclient/python-heatclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-heatclient' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-karborclient/python-karborclient.spec.j2 b/openstack/python-karborclient/python-karborclient.spec.j2
index 0a8c4c1ff..830a291ef 100644
--- a/openstack/python-karborclient/python-karborclient.spec.j2
+++ b/openstack/python-karborclient/python-karborclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-karborclient' %}
-{% set upstream_version = upstream_version('1.4.0') %}
+{% set upstream_version = upstream_version('2.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
index 39c94dbab..e90370a5f 100644
--- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2
+++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-keystoneclient' %}
-{% set upstream_version = upstream_version('3.22.0') %}
+{% set upstream_version = upstream_version('4.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-magnumclient/python-magnumclient.spec.j2 b/openstack/python-magnumclient/python-magnumclient.spec.j2
index 702f1663b..d529866b7 100644
--- a/openstack/python-magnumclient/python-magnumclient.spec.j2
+++ b/openstack/python-magnumclient/python-magnumclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-magnumclient' %}
-{% set upstream_version = upstream_version('2.17.0') %}
+{% set upstream_version = upstream_version('3.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-manilaclient/python-manilaclient.spec.j2 b/openstack/python-manilaclient/python-manilaclient.spec.j2
index 04d44da0f..b3fbfc53e 100644
--- a/openstack/python-manilaclient/python-manilaclient.spec.j2
+++ b/openstack/python-manilaclient/python-manilaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-manilaclient' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-masakariclient/python-masakariclient.spec.j2 b/openstack/python-masakariclient/python-masakariclient.spec.j2
index 81ec75c6f..55116deff 100644
--- a/openstack/python-masakariclient/python-masakariclient.spec.j2
+++ b/openstack/python-masakariclient/python-masakariclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-masakariclient' %}
-{% set upstream_version = upstream_version('5.6.0') %}
+{% set upstream_version = upstream_version('6.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2
index 1bf75b108..31a86aa65 100644
--- a/openstack/python-mistralclient/python-mistralclient.spec.j2
+++ b/openstack/python-mistralclient/python-mistralclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-mistralclient' %}
-{% set upstream_version = upstream_version('4.0.0') %}
+{% set upstream_version = upstream_version('4.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-monascaclient/python-monascaclient.spec.j2 b/openstack/python-monascaclient/python-monascaclient.spec.j2
index 26031d9d4..f512e5904 100644
--- a/openstack/python-monascaclient/python-monascaclient.spec.j2
+++ b/openstack/python-monascaclient/python-monascaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-monascaclient' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-muranoclient/python-muranoclient.spec.j2 b/openstack/python-muranoclient/python-muranoclient.spec.j2
index f9c223145..b3d1fa525 100644
--- a/openstack/python-muranoclient/python-muranoclient.spec.j2
+++ b/openstack/python-muranoclient/python-muranoclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-muranoclient' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-neutronclient/python-neutronclient.spec.j2 b/openstack/python-neutronclient/python-neutronclient.spec.j2
index b7493a351..e6d4cf0ae 100644
--- a/openstack/python-neutronclient/python-neutronclient.spec.j2
+++ b/openstack/python-neutronclient/python-neutronclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-neutronclient' %}
-{% set upstream_version = upstream_version('7.1.0') %}
+{% set upstream_version = upstream_version('7.1.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-novaclient/python-novaclient.spec.j2 b/openstack/python-novaclient/python-novaclient.spec.j2
index d3309b514..3ebfae922 100644
--- a/openstack/python-novaclient/python-novaclient.spec.j2
+++ b/openstack/python-novaclient/python-novaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-novaclient' %}
-{% set upstream_version = upstream_version('16.0.0') %}
+{% set upstream_version = upstream_version('17.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-octaviaclient/python-octaviaclient.spec.j2 b/openstack/python-octaviaclient/python-octaviaclient.spec.j2
index 9b74a2f98..53d72306b 100644
--- a/openstack/python-octaviaclient/python-octaviaclient.spec.j2
+++ b/openstack/python-octaviaclient/python-octaviaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-octaviaclient' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -72,6 +72,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
+# we don't want hacking
+rm -f octaviaclient/tests/unit/test_hacking.py
 python3 -m stestr.cli run
 
 %files -n python3-octaviaclient
diff --git a/openstack/python-openstackclient/python-openstackclient.spec.j2 b/openstack/python-openstackclient/python-openstackclient.spec.j2
index 3dc02f6f7..e7e1ca06f 100644
--- a/openstack/python-openstackclient/python-openstackclient.spec.j2
+++ b/openstack/python-openstackclient/python-openstackclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-openstackclient' %}
-{% set upstream_version = upstream_version('4.0.0') %}
+{% set upstream_version = upstream_version('5.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-qinlingclient/python-qinlingclient.spec.j2 b/openstack/python-qinlingclient/python-qinlingclient.spec.j2
index 223db1ee6..ca2336f94 100644
--- a/openstack/python-qinlingclient/python-qinlingclient.spec.j2
+++ b/openstack/python-qinlingclient/python-qinlingclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-qinlingclient' %}
-{% set upstream_version = upstream_version('4.0.0') %}
+{% set upstream_version = upstream_version('5.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-saharaclient/python-saharaclient.spec.j2 b/openstack/python-saharaclient/python-saharaclient.spec.j2
index 92070ee83..59726dbb2 100644
--- a/openstack/python-saharaclient/python-saharaclient.spec.j2
+++ b/openstack/python-saharaclient/python-saharaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-saharaclient' %}
-{% set upstream_version = upstream_version('2.3.0') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-senlinclient/python-senlinclient.spec.j2 b/openstack/python-senlinclient/python-senlinclient.spec.j2
index 80aa453e3..81c38fa31 100644
--- a/openstack/python-senlinclient/python-senlinclient.spec.j2
+++ b/openstack/python-senlinclient/python-senlinclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-senlinclient' %}
-{% set upstream_version = upstream_version('1.11.0') %}
+{% set upstream_version = upstream_version('2.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-solumclient/python-solumclient.spec.j2 b/openstack/python-solumclient/python-solumclient.spec.j2
index 2fe4fcefe..f7dd9fb26 100644
--- a/openstack/python-solumclient/python-solumclient.spec.j2
+++ b/openstack/python-solumclient/python-solumclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-solumclient' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-tackerclient/python-tackerclient.spec.j2 b/openstack/python-tackerclient/python-tackerclient.spec.j2
index 871bd06c8..8b891c528 100644
--- a/openstack/python-tackerclient/python-tackerclient.spec.j2
+++ b/openstack/python-tackerclient/python-tackerclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-tackerclient' %}
-{% set upstream_version = upstream_version('0.16.1') %}
+{% set upstream_version = upstream_version('1.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-troveclient/python-troveclient.spec.j2 b/openstack/python-troveclient/python-troveclient.spec.j2
index 63c020b3b..0dc834e5c 100644
--- a/openstack/python-troveclient/python-troveclient.spec.j2
+++ b/openstack/python-troveclient/python-troveclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-troveclient' %}
-{% set upstream_version = upstream_version('3.3.0') %}
+{% set upstream_version = upstream_version('3.3.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-vitrageclient/python-vitrageclient.spec.j2 b/openstack/python-vitrageclient/python-vitrageclient.spec.j2
index 7bec8179e..79cfa680a 100644
--- a/openstack/python-vitrageclient/python-vitrageclient.spec.j2
+++ b/openstack/python-vitrageclient/python-vitrageclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-vitrageclient' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('4.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 %if 0%{?suse_version}
diff --git a/openstack/python-watcherclient/python-watcherclient.spec.j2 b/openstack/python-watcherclient/python-watcherclient.spec.j2
index 6df579af7..94b110540 100644
--- a/openstack/python-watcherclient/python-watcherclient.spec.j2
+++ b/openstack/python-watcherclient/python-watcherclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-watcherclient' %}
-{% set upstream_version = upstream_version('2.5.0') %}
+{% set upstream_version = upstream_version('3.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -66,6 +66,7 @@ Summary:        Documentation for OpenStack Watcher API client libary
 Group:          Documentation/HTML
 BuildRequires:  {{ py3('Sphinx') }}
 BuildRequires:  {{ py3('openstackdocstheme') }}
+BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 
 %description -n python-watcherclient-doc
 Client library for Watcher built on the Watcher API. It provides a Python API
diff --git a/openstack/python-zaqarclient/python-zaqarclient.spec.j2 b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
index 57f37754a..f1b6980ab 100644
--- a/openstack/python-zaqarclient/python-zaqarclient.spec.j2
+++ b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-zaqarclient' %}
-{% set upstream_version = upstream_version('1.12.0') %}
+{% set upstream_version = upstream_version('1.13.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-zunclient/python-zunclient.spec.j2 b/openstack/python-zunclient/python-zunclient.spec.j2
index 3415f8baa..66c2a29fd 100644
--- a/openstack/python-zunclient/python-zunclient.spec.j2
+++ b/openstack/python-zunclient/python-zunclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-zunclient' %}
-{% set upstream_version = upstream_version('3.6.0') %}
+{% set upstream_version = upstream_version('4.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}