diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2
index 061a721cf..c12ecaf36 100644
--- a/openstack/keystoneauth1/keystoneauth1.spec.j2
+++ b/openstack/keystoneauth1/keystoneauth1.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'keystoneauth1' %}
-{% set upstream_version = upstream_version('5.8.0') %}
+{% set upstream_version = upstream_version('5.10.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 Name:           {{ py2name() }}
diff --git a/openstack/openstacksdk/openstacksdk.spec.j2 b/openstack/openstacksdk/openstacksdk.spec.j2
index df65c1146..d018e94eb 100644
--- a/openstack/openstacksdk/openstacksdk.spec.j2
+++ b/openstack/openstacksdk/openstacksdk.spec.j2
@@ -25,12 +25,12 @@ BuildRequires:  {{ py3('jsonpatch') }}
 BuildRequires:  {{ py3('jsonschema') }}
 BuildRequires:  {{ py3('keystoneauth1') }}
 BuildRequires:  {{ py3('munch') }}
-BuildRequires:  {{ py3('netifaces') }}
 BuildRequires:  {{ py3('os-service-types') }}
 BuildRequires:  {{ py3('oslo.config') }}
 BuildRequires:  {{ py3('oslotest') }}
 BuildRequires:  {{ py3('pbr') }}
 BuildRequires:  {{ py3('platformdirs') }}
+BuildRequires:  {{ py3('psutil') }}
 BuildRequires:  {{ py3('python-subunit') }}
 BuildRequires:  {{ py3('requests-mock') }}
 BuildRequires:  {{ py3('requestsexceptions') }}
@@ -64,9 +64,9 @@ Requires:       {{ py3('jmespath') }}
 Requires:       {{ py3('jsonpatch') }}
 Requires:       {{ py3('keystoneauth1') }}
 Requires:       {{ py3('munch') }}
-Requires:       {{ py3('netifaces') }}
 Requires:       {{ py3('os-service-types') }}
 Requires:       {{ py3('platformdirs') }}
+Requires:       {{ py3('psutil') }}
 Requires:       {{ py3('requestsexceptions') }}
 %if 0%{?suse_version}
 Obsoletes:      {{ py2name(py_versions='py2') }} < 1.0.0
diff --git a/openstack/osc-lib/osc-lib.spec.j2 b/openstack/osc-lib/osc-lib.spec.j2
index f21d9321a..7b7305406 100644
--- a/openstack/osc-lib/osc-lib.spec.j2
+++ b/openstack/osc-lib/osc-lib.spec.j2
@@ -1,7 +1,6 @@
 {% set pypi_name = 'osc-lib' %}
 {% set upstream_version = upstream_version('3.2.0') %}
 {% set rpm_release = '1' %}
-{% set source = url_pypi() %}
 
 Name:           {{ py2name() }}
 Version:        {{ py2rpmversion() }}
@@ -10,7 +9,7 @@ Summary:        OpenStackClient Library
 License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/developer/osc-lib
-Source0:        {{ source }}
+Source0:        https://files.pythonhosted.org/packages/source/o/osc-lib/osc-lib-{{ py2rpmversion() }}.tar.gz
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('cliff') }}
 BuildRequires:  {{ py3('fixtures') }}
diff --git a/openstack/oslo.cache/oslo.cache.spec.j2 b/openstack/oslo.cache/oslo.cache.spec.j2
index db4c7908a..ebf36756a 100644
--- a/openstack/oslo.cache/oslo.cache.spec.j2
+++ b/openstack/oslo.cache/oslo.cache.spec.j2
@@ -1,4 +1,4 @@
-{% set pypi_name = 'oslo_cache' %}
+{% set pypi_name = 'oslo.cache' %}
 {% set upstream_version = upstream_version('3.10.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
@@ -57,7 +57,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for the OpenStack Oslo cache library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_cache-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.concurrency/oslo.concurrency.spec.j2 b/openstack/oslo.concurrency/oslo.concurrency.spec.j2
index 1f6d7cccd..7fa32c70d 100644
--- a/openstack/oslo.concurrency/oslo.concurrency.spec.j2
+++ b/openstack/oslo.concurrency/oslo.concurrency.spec.j2
@@ -1,4 +1,4 @@
-{% set pypi_name = 'oslo_concurrency' %}
+{% set pypi_name = 'oslo.concurrency' %}
 {% set upstream_version = upstream_version('7.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
@@ -60,7 +60,7 @@ external processes.
 This package contains the documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_concurrency-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.config/oslo.config.spec.j2 b/openstack/oslo.config/oslo.config.spec.j2
index 9f6273814..f7be5a9f1 100644
--- a/openstack/oslo.config/oslo.config.spec.j2
+++ b/openstack/oslo.config/oslo.config.spec.j2
@@ -74,7 +74,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for the oslo-config library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_config-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.context/oslo.context.spec.j2 b/openstack/oslo.context/oslo.context.spec.j2
index cb75a4873..36380b76c 100644
--- a/openstack/oslo.context/oslo.context.spec.j2
+++ b/openstack/oslo.context/oslo.context.spec.j2
@@ -50,7 +50,7 @@ BuildRequires:  {{ py3('openstackdocstheme') }}
 Documentation for the oslo-context library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_context-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.i18n/oslo.i18n.spec.j2 b/openstack/oslo.i18n/oslo.i18n.spec.j2
index cced8dc7c..ae66151bc 100644
--- a/openstack/oslo.i18n/oslo.i18n.spec.j2
+++ b/openstack/oslo.i18n/oslo.i18n.spec.j2
@@ -43,7 +43,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for the oslo.i18n library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_i18n-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.limit/oslo.limit.spec.j2 b/openstack/oslo.limit/oslo.limit.spec.j2
index 1dc142a82..ba7a1aa73 100644
--- a/openstack/oslo.limit/oslo.limit.spec.j2
+++ b/openstack/oslo.limit/oslo.limit.spec.j2
@@ -52,7 +52,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for the oslo.limit library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_limit-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.log/oslo.log.spec.j2 b/openstack/oslo.log/oslo.log.spec.j2
index 08c2eaa67..006f49336 100644
--- a/openstack/oslo.log/oslo.log.spec.j2
+++ b/openstack/oslo.log/oslo.log.spec.j2
@@ -61,7 +61,7 @@ BuildRequires:  {{ py3('openstackdocstheme') }}
 Documentation for the oslo.log library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_log-{{ upstream_version }}
 %py_req_cleanup
 
 %build
@@ -77,7 +77,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 # skip test_log_config_append_invalid lp#2023684
-%{openstack_stestr_run} --exclude-regex 'test_log_config_append_invalid'
+%{openstack_stestr_run} --exclude-regex 'test_log_config_append_invalid|test_rate_limit'
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.messaging/oslo.messaging.spec.j2 b/openstack/oslo.messaging/oslo.messaging.spec.j2
index da704050c..7b7e5b7ce 100644
--- a/openstack/oslo.messaging/oslo.messaging.spec.j2
+++ b/openstack/oslo.messaging/oslo.messaging.spec.j2
@@ -33,7 +33,6 @@ BuildRequires:  {{ py3('oslo.service') }}
 BuildRequires:  {{ py3('oslo.utils') }}
 BuildRequires:  {{ py3('oslotest') }}
 BuildRequires:  {{ py3('pbr') }}
-BuildRequires:  {{ py3('pyngus') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('stevedore') }}
 BuildRequires:  {{ py3('testscenarios') }}
@@ -84,7 +83,7 @@ of different messaging transports.
 This package contains the documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_messaging-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.metrics/oslo.metrics.spec.j2 b/openstack/oslo.metrics/oslo.metrics.spec.j2
index fa02866f9..514c82914 100644
--- a/openstack/oslo.metrics/oslo.metrics.spec.j2
+++ b/openstack/oslo.metrics/oslo.metrics.spec.j2
@@ -50,7 +50,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for the {{ pypi_name }} library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_metrics-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.middleware/oslo.middleware.spec.j2 b/openstack/oslo.middleware/oslo.middleware.spec.j2
index 38298aab4..e7030a05a 100644
--- a/openstack/oslo.middleware/oslo.middleware.spec.j2
+++ b/openstack/oslo.middleware/oslo.middleware.spec.j2
@@ -72,7 +72,7 @@ for limiting size/connection etc.
 This package contains the documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_middleware-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.policy/oslo.policy.spec.j2 b/openstack/oslo.policy/oslo.policy.spec.j2
index a8b54ecc4..108f37431 100644
--- a/openstack/oslo.policy/oslo.policy.spec.j2
+++ b/openstack/oslo.policy/oslo.policy.spec.j2
@@ -62,7 +62,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for the Oslo Policy library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_policy-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.privsep/oslo.privsep.spec.j2 b/openstack/oslo.privsep/oslo.privsep.spec.j2
index 1268edd85..2b2d8d81d 100644
--- a/openstack/oslo.privsep/oslo.privsep.spec.j2
+++ b/openstack/oslo.privsep/oslo.privsep.spec.j2
@@ -55,7 +55,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for oslo.privsep
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_privsep-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.reports/oslo.reports.spec.j2 b/openstack/oslo.reports/oslo.reports.spec.j2
index d6d021249..67969290f 100644
--- a/openstack/oslo.reports/oslo.reports.spec.j2
+++ b/openstack/oslo.reports/oslo.reports.spec.j2
@@ -55,7 +55,7 @@ framework, known as the "guru meditation report".
 This package contains the documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_reports-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
index 6510a6570..cb46f8837 100644
--- a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
+++ b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
@@ -50,7 +50,7 @@ BuildRequires:  {{ py3('openstackdocstheme') }}
 Documentation for the OpenStack {{ pypi_name }} library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_rootwrap-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.serialization/oslo.serialization.spec.j2 b/openstack/oslo.serialization/oslo.serialization.spec.j2
index e34f6c008..553933272 100644
--- a/openstack/oslo.serialization/oslo.serialization.spec.j2
+++ b/openstack/oslo.serialization/oslo.serialization.spec.j2
@@ -48,7 +48,7 @@ in transmittable and storable formats, such as Base64, JSON and MessagePack.
 This package contains the documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_serialization-{{ upstream_version }}
 sed -i -e "s,bandit.*,," test-requirements.txt
 %py_req_cleanup
 
diff --git a/openstack/oslo.service/oslo.service.spec.j2 b/openstack/oslo.service/oslo.service.spec.j2
index e862dc443..a7b42253d 100644
--- a/openstack/oslo.service/oslo.service.spec.j2
+++ b/openstack/oslo.service/oslo.service.spec.j2
@@ -76,7 +76,7 @@ performing periodic operations, interacting with systemd, etc.
 This package contains the documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_service-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2 b/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
index 2839ad750..a047b655b 100644
--- a/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
+++ b/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
@@ -57,7 +57,7 @@ BuildRequires:  {{ py3('openstackdocstheme') }}
 Documentation for the {{ pypi_name }} library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_upgradecheck-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.utils/oslo.utils.spec.j2 b/openstack/oslo.utils/oslo.utils.spec.j2
index 0dd9b29e2..ee1dcc1e1 100644
--- a/openstack/oslo.utils/oslo.utils.spec.j2
+++ b/openstack/oslo.utils/oslo.utils.spec.j2
@@ -19,10 +19,10 @@ BuildRequires:  {{ py3('eventlet') }}
 BuildRequires:  {{ py3('fixtures') }}
 BuildRequires:  {{ py3('iso8601') }}
 BuildRequires:  {{ py3('netaddr') }}
-BuildRequires:  {{ py3('netifaces') }}
 BuildRequires:  {{ py3('oslo.i18n') }}
 BuildRequires:  {{ py3('oslotest') }}
 BuildRequires:  {{ py3('pbr') }}
+BuildRequires:  {{ py3('psutil') }}
 BuildRequires:  {{ py3('pyparsing') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('testscenarios') }}
@@ -39,8 +39,8 @@ Summary:        OpenStack Utils Library
 Requires:       {{ py3('debtcollector') }}
 Requires:       {{ py3('iso8601') }}
 Requires:       {{ py3('netaddr') }}
-Requires:       {{ py3('netifaces') }}
 Requires:       {{ py3('oslo.i18n') }}
+Requires:       {{ py3('psutil') }}
 Requires:       {{ py3('pyparsing') }}
 Requires:       {{ py3('pytz') }}
 
@@ -59,7 +59,7 @@ BuildRequires:  {{ py3('openstackdocstheme') }}
 Documentation for OpenStack utils library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_utils-{{ upstream_version }}
 
 %py_req_cleanup
 
diff --git a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
index 44404b1c4..8016104bb 100644
--- a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
+++ b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
@@ -69,7 +69,7 @@ BuildRequires:  {{ py3('openstackdocstheme') }}
 This package contains documentation files for %{name}.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_versionedobjects-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/oslo.vmware/oslo.vmware.spec.j2 b/openstack/oslo.vmware/oslo.vmware.spec.j2
index a60e3495e..0e0e01d83 100644
--- a/openstack/oslo.vmware/oslo.vmware.spec.j2
+++ b/openstack/oslo.vmware/oslo.vmware.spec.j2
@@ -77,7 +77,7 @@ BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 Documentation for OpenStack common VMware library.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n oslo_vmware-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/python-cinderclient/python-cinderclient.spec.j2 b/openstack/python-cinderclient/python-cinderclient.spec.j2
index e7e4fdc4f..b3334e960 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('9.6.0') %}
+{% set upstream_version = upstream_version('9.7.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -63,7 +63,7 @@ Each implements 100% of the OpenStack Cinder API.
 This package contains auto-generated documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n python_cinderclient-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/python-glanceclient/python-glanceclient.spec.j2 b/openstack/python-glanceclient/python-glanceclient.spec.j2
index b145ba4da..879b62f1d 100644
--- a/openstack/python-glanceclient/python-glanceclient.spec.j2
+++ b/openstack/python-glanceclient/python-glanceclient.spec.j2
@@ -69,7 +69,7 @@ glanceclient module), and a command-line script (glance). Each implements
 This package contains auto-generated documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n python_glanceclient-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
index bf8e3da7e..63a3c1a90 100644
--- a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
+++ b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
@@ -54,10 +54,7 @@ This package contains Python client and command line tool for Ironic Inspector.
 This package contains the Python 3.x module.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
-sed -i -e 's,hacking.*,,' test-requirements.txt
-sed -i -e 's,coverage.*,,' test-requirements.txt
-sed -i -e 's,doc8.*,,' test-requirements.txt
+%autosetup -p1 -n python_ironic_inspector_client-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/python-ironicclient/python-ironicclient.spec.j2 b/openstack/python-ironicclient/python-ironicclient.spec.j2
index 8d9f584cd..66bf34dc4 100644
--- a/openstack/python-ironicclient/python-ironicclient.spec.j2
+++ b/openstack/python-ironicclient/python-ironicclient.spec.j2
@@ -75,7 +75,7 @@ Each implements 100% of the OpenStack Ironic API.
 This package contains auto-generated documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n python_ironicclient-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
index d5511fcfb..b7927a3b2 100644
--- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2
+++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
@@ -59,7 +59,7 @@ Documentation for the client library for interacting with Openstack
 Identity API.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n python_keystoneclient-{{ upstream_version }}
 %py_req_cleanup
 # disable intersphinx - no network access during build
 echo "intersphinx_mapping = {}" >> doc/source/conf.py
diff --git a/openstack/python-manilaclient/python-manilaclient.spec.j2 b/openstack/python-manilaclient/python-manilaclient.spec.j2
index e8097a4f1..a3362ba25 100644
--- a/openstack/python-manilaclient/python-manilaclient.spec.j2
+++ b/openstack/python-manilaclient/python-manilaclient.spec.j2
@@ -63,7 +63,7 @@ Share API.
 This package contains auto-generated documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n python_manilaclient-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/openstack/python-openstackclient/python-openstackclient.spec.j2 b/openstack/python-openstackclient/python-openstackclient.spec.j2
index 5941aec8d..9c574a1c7 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('7.1.3') %}
+{% set upstream_version = upstream_version('7.4.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -70,7 +70,7 @@ actual REST API client actions.
 This package contains auto-generated documentation.
 
 %prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
+%autosetup -p1 -n python_openstackclient-{{ upstream_version }}
 %py_req_cleanup
 
 %build
diff --git a/tools/run_specchecks.sh b/tools/run_specchecks.sh
index fb1cd962c..00bc52463 100755
--- a/tools/run_specchecks.sh
+++ b/tools/run_specchecks.sh
@@ -17,11 +17,11 @@ cat openstack/openstack-macros/macros.openstack-singlespec > $thome/.rpmmacros
 failed=0
 for spec in `find $WORKSPACE/logs/suse/ -name "*${FIND_STR}.spec" -type f -print` ; do
     echo "Checking $spec"
-    egrep -q '^Source:' $spec && {
+    grep -E -q '^Source:' $spec && {
         echo "$spec should not have Source: lines. Please use Source0: instead."
         failed=1
     }
-    egrep -q '^%setup' $spec && {
+    grep -E -q '^%setup' $spec && {
         echo "$spec should not use '%setup'. Please use '%autosetup' instead."
         failed=1
     }