Add py_req_cleanup macro to all Python spec templates

Fedora specs use to remove requirements.txt and test-requirements.txt during %prep, to prevent any attempt to download from PyPi while building. We now have a py_req_cleanup macro in openstack-macros, so let's use it. This will only change the outcome in packages using centos. Change-Id: I7d7a27d4909990a9d26433cd65e799cae3af7904
2016-10-11 17:00:11 +02:00
parent 3f7464d2e0
commit a948fc29a5
87 changed files with 87 additions and 0 deletions
--- a/openstack/Bareon/Bareon.spec.j2
+++ b/openstack/Bareon/Bareon.spec.j2
@@ -76,6 +76,7 @@ Documentation for OpenStack bareon tool.

 %prep
 %autosetup -n %{sname}-%{sversion}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/Tempest/Tempest.spec.j2
+++ b/openstack/Tempest/Tempest.spec.j2
@@ -73,6 +73,7 @@ Documentation for the OpenStack Integration Test Suite.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/aodhclient/aodhclient.spec.j2
+++ b/openstack/aodhclient/aodhclient.spec.j2
@@ -51,6 +51,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/automaton/automaton.spec.j2
+++ b/openstack/automaton/automaton.spec.j2
@@ -36,6 +36,7 @@ Documentation for the Automaton library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/castellan/castellan.spec.j2
+++ b/openstack/castellan/castellan.spec.j2
@@ -44,6 +44,7 @@ This package contains the documentation

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
+++ b/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
@@ -45,6 +45,7 @@ This package contains documentation in HTML format.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/cliff/cliff.spec.j2
+++ b/openstack/cliff/cliff.spec.j2
@@ -49,6 +49,7 @@ This package contains documentation files for %{name}.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/debtcollector/debtcollector.spec.j2
+++ b/openstack/debtcollector/debtcollector.spec.j2
@@ -55,6 +55,7 @@ This package contains documentation in HTML format.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/django_openstack_auth/django_openstack_auth.spec.j2
+++ b/openstack/django_openstack_auth/django_openstack_auth.spec.j2
@@ -48,6 +48,7 @@ This package contains documentation in HTML format.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/futurist/futurist.spec.j2
+++ b/openstack/futurist/futurist.spec.j2
@@ -36,6 +36,7 @@ Useful additions to futures from the future.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/glance_store/glance_store.spec.j2
+++ b/openstack/glance_store/glance_store.spec.j2
@@ -70,6 +70,7 @@ Documentation for the Glance store library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup
 # NOTE(toabctl): Can be removed when https://review.openstack.org/364532 is included
 sed -i -e 's/^\(html_last_updated_fmt.*\)\(git_cmd\)/\1"\/usr\/bin\/true"/' doc/source/conf.py

--- a/openstack/gnocchiclient/gnocchiclient.spec.j2
+++ b/openstack/gnocchiclient/gnocchiclient.spec.j2
@@ -48,6 +48,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/ironic-lib/ironic-lib.spec.j2
+++ b/openstack/ironic-lib/ironic-lib.spec.j2
@@ -27,6 +27,7 @@ governance <http://governance.openstack.org/reference/projects/ironic.html>`

 %prep
 %autosetup -n ironic-lib-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/keystoneauth1/keystoneauth1.spec.j2
+++ b/openstack/keystoneauth1/keystoneauth1.spec.j2
@@ -56,6 +56,7 @@ Documentation for OpenStack authenticating tools.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/keystonemiddleware/keystonemiddleware.spec.j2
+++ b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
@@ -61,6 +61,7 @@ Documentation for Middleware for OpenStack Identity.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/microversion_parse/microversion_parse.spec.j2
+++ b/openstack/microversion_parse/microversion_parse.spec.j2
@@ -28,6 +28,7 @@ headers parsing library.

 %prep
 %autosetup -n microversion_parse-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/mox3/mox3.spec.j2
+++ b/openstack/mox3/mox3.spec.j2
@@ -41,6 +41,7 @@ This package contains documentation in HTML format.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/openstack-doc-tools/openstack-doc-tools.spec.j2
+++ b/openstack/openstack-doc-tools/openstack-doc-tools.spec.j2
@@ -32,6 +32,7 @@ Tools used by the OpenStack Documentation Project.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/openstackdocstheme/openstackdocstheme.spec.j2
+++ b/openstack/openstackdocstheme/openstackdocstheme.spec.j2
@@ -25,6 +25,7 @@ to docs.openstack.org. Intended for use by OpenStack projects.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/openstacksdk/openstacksdk.spec.j2
+++ b/openstack/openstacksdk/openstacksdk.spec.j2
@@ -51,6 +51,7 @@ This package contains documentation files for %{name}.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/os-api-ref/os-api-ref.spec.j2
+++ b/openstack/os-api-ref/os-api-ref.spec.j2
@@ -40,6 +40,7 @@ expand / collapse all sections.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/os-brick/os-brick.spec.j2
+++ b/openstack/os-brick/os-brick.spec.j2
@@ -69,6 +69,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/os-client-config/os-client-config.spec.j2
+++ b/openstack/os-client-config/os-client-config.spec.j2
@@ -53,6 +53,7 @@ Documentation for the os-client-config library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/os-testr/os-testr.spec.j2
+++ b/openstack/os-testr/os-testr.spec.j2
@@ -38,6 +38,7 @@ Documentation for the testr wrapper.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/os-vif/os-vif.spec.j2
+++ b/openstack/os-vif/os-vif.spec.j2
@@ -52,6 +52,7 @@ in OpenStack.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/os-win/os-win.spec.j2
+++ b/openstack/os-win/os-win.spec.j2
@@ -50,6 +50,7 @@ Documentation for the Hyper-V library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/osc-lib/osc-lib.spec.j2
+++ b/openstack/osc-lib/osc-lib.spec.j2
@@ -54,6 +54,7 @@ Documentation for the OpenStack client library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{__python2} setup.py build
--- a/openstack/oslo.cache/oslo.cache.spec.j2
+++ b/openstack/oslo.cache/oslo.cache.spec.j2
@@ -45,6 +45,7 @@ Documentation for the OpenStack Oslo cache library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.concurrency/oslo.concurrency.spec.j2
+++ b/openstack/oslo.concurrency/oslo.concurrency.spec.j2
@@ -51,6 +51,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.config/oslo.config.spec.j2
+++ b/openstack/oslo.config/oslo.config.spec.j2
@@ -51,6 +51,7 @@ Documentation for the oslo-config library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.context/oslo.context.spec.j2
+++ b/openstack/oslo.context/oslo.context.spec.j2
@@ -34,6 +34,7 @@ Documentation for the oslo-context library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.db/oslo.db.spec.j2
+++ b/openstack/oslo.db/oslo.db.spec.j2
@@ -62,6 +62,7 @@ Documentation for the Oslo database handling library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.i18n/oslo.i18n.spec.j2
+++ b/openstack/oslo.i18n/oslo.i18n.spec.j2
@@ -31,6 +31,7 @@ Documentation for the oslo.i18n library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.log/oslo.log.spec.j2
+++ b/openstack/oslo.log/oslo.log.spec.j2
@@ -52,6 +52,7 @@ Documentation for the oslo.log library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.messaging/oslo.messaging.spec.j2
+++ b/openstack/oslo.messaging/oslo.messaging.spec.j2
@@ -86,6 +86,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.middleware/oslo.middleware.spec.j2
+++ b/openstack/oslo.middleware/oslo.middleware.spec.j2
@@ -55,6 +55,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.policy/oslo.policy.spec.j2
+++ b/openstack/oslo.policy/oslo.policy.spec.j2
@@ -40,6 +40,7 @@ Documentation for the Oslo Policy library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.privsep/oslo.privsep.spec.j2
+++ b/openstack/oslo.privsep/oslo.privsep.spec.j2
@@ -48,6 +48,7 @@ Documentation for oslo.privsep

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/oslo.reports/oslo.reports.spec.j2
+++ b/openstack/oslo.reports/oslo.reports.spec.j2
@@ -44,6 +44,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
+++ b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
@@ -42,6 +42,7 @@ Documentation for the OpenStack %{sname} library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.serialization/oslo.serialization.spec.j2
+++ b/openstack/oslo.serialization/oslo.serialization.spec.j2
@@ -39,6 +39,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.service/oslo.service.spec.j2
+++ b/openstack/oslo.service/oslo.service.spec.j2
@@ -63,6 +63,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.utils/oslo.utils.spec.j2
+++ b/openstack/oslo.utils/oslo.utils.spec.j2
@@ -50,6 +50,7 @@ Documentation for OpenStack utils library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
+++ b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
@@ -56,6 +56,7 @@ This package contains documentation files for %{name}.

 %prep
 %autosetup -n oslo.versionedobjects-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslo.vmware/oslo.vmware.spec.j2
+++ b/openstack/oslo.vmware/oslo.vmware.spec.j2
@@ -60,6 +60,7 @@ Documentation for OpenStack common VMware library.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/oslosphinx/oslosphinx.spec.j2
+++ b/openstack/oslosphinx/oslosphinx.spec.j2
@@ -22,6 +22,7 @@ layer of Sphinx plugins.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/oslotest/oslotest.spec.j2
+++ b/openstack/oslotest/oslotest.spec.j2
@@ -36,6 +36,7 @@ better support for mocking results.

 %prep
 %autosetup -n oslotest-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/osprofiler/osprofiler.spec.j2
+++ b/openstack/osprofiler/osprofiler.spec.j2
@@ -43,6 +43,7 @@ Documentation for OSProfiler.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/pycadf/pycadf.spec.j2
+++ b/openstack/pycadf/pycadf.spec.j2
@@ -36,6 +36,7 @@ Documentation for the DMTF Cloud Audit (CADF) data model.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/pymod2pkg/pymod2pkg.spec.j2
+++ b/openstack/pymod2pkg/pymod2pkg.spec.j2
@@ -31,6 +31,7 @@ Documentation for python module name to package name map library.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-barbicanclient/python-barbicanclient.spec.j2
+++ b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
@@ -48,6 +48,7 @@ Openstack Key Management API

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 # Remove the sphinx-build leftovers
 rm -rf html/.{doctrees,buildinfo}
--- a/openstack/python-ceilometerclient/python-ceilometerclient.spec.j2
+++ b/openstack/python-ceilometerclient/python-ceilometerclient.spec.j2
@@ -56,6 +56,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-cinderclient/python-cinderclient.spec.j2
+++ b/openstack/python-cinderclient/python-cinderclient.spec.j2
@@ -53,6 +53,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
+++ b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
@@ -50,6 +50,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-congressclient/python-congressclient.spec.j2
+++ b/openstack/python-congressclient/python-congressclient.spec.j2
@@ -66,6 +66,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-designateclient/python-designateclient.spec.j2
+++ b/openstack/python-designateclient/python-designateclient.spec.j2
@@ -44,6 +44,7 @@ Documentation for the OpenStack DNS as a Service - Client.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-dracclient/python-dracclient.spec.j2
+++ b/openstack/python-dracclient/python-dracclient.spec.j2
@@ -38,6 +38,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-freezerclient/python-freezerclient.spec.j2
+++ b/openstack/python-freezerclient/python-freezerclient.spec.j2
@@ -48,6 +48,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-glanceclient/python-glanceclient.spec.j2
+++ b/openstack/python-glanceclient/python-glanceclient.spec.j2
@@ -53,6 +53,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-heatclient/python-heatclient.spec.j2
+++ b/openstack/python-heatclient/python-heatclient.spec.j2
@@ -57,6 +57,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
+++ b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
@@ -33,6 +33,7 @@ This package contains Python client and command line tool for Ironic Inspector.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-ironicclient/python-ironicclient.spec.j2
+++ b/openstack/python-ironicclient/python-ironicclient.spec.j2
@@ -64,6 +64,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-k8sclient/python-k8sclient.spec.j2
+++ b/openstack/python-k8sclient/python-k8sclient.spec.j2
@@ -39,6 +39,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-karborclient/python-karborclient.spec.j2
+++ b/openstack/python-karborclient/python-karborclient.spec.j2
@@ -57,6 +57,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2
+++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
@@ -54,6 +54,7 @@ Identity API.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-magnumclient/python-magnumclient.spec.j2
+++ b/openstack/python-magnumclient/python-magnumclient.spec.j2
@@ -57,6 +57,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-manilaclient/python-manilaclient.spec.j2
+++ b/openstack/python-manilaclient/python-manilaclient.spec.j2
@@ -64,6 +64,7 @@ This package contains the testsuite.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-mistralclient/python-mistralclient.spec.j2
+++ b/openstack/python-mistralclient/python-mistralclient.spec.j2
@@ -46,6 +46,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-muranoclient/python-muranoclient.spec.j2
+++ b/openstack/python-muranoclient/python-muranoclient.spec.j2
@@ -61,6 +61,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-neutronclient/python-neutronclient.spec.j2
+++ b/openstack/python-neutronclient/python-neutronclient.spec.j2
@@ -61,6 +61,7 @@ Neutron's API.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-novaclient/python-novaclient.spec.j2
+++ b/openstack/python-novaclient/python-novaclient.spec.j2
@@ -79,6 +79,7 @@ This package contains the testsuite.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-oneviewclient/python-oneviewclient.spec.j2
+++ b/openstack/python-oneviewclient/python-oneviewclient.spec.j2
@@ -39,6 +39,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-openstackclient/python-openstackclient.spec.j2
+++ b/openstack/python-openstackclient/python-openstackclient.spec.j2
@@ -75,6 +75,7 @@ This package contains auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-saharaclient/python-saharaclient.spec.j2
+++ b/openstack/python-saharaclient/python-saharaclient.spec.j2
@@ -51,6 +51,7 @@ Python client library for interacting with OpenStack Sahara API.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup
 # FIXME: can be removed when https://review.openstack.org/#/c/363681/ is merged
 sed -i -e 's/^\s\{4\}git_cmd\(.*\)/    "\/usr\/bin\/true"\1/' doc/source/conf.py

--- a/openstack/python-scciclient/python-scciclient.spec.j2
+++ b/openstack/python-scciclient/python-scciclient.spec.j2
@@ -40,6 +40,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-senlinclient/python-senlinclient.spec.j2
+++ b/openstack/python-senlinclient/python-senlinclient.spec.j2
@@ -67,6 +67,7 @@ auto-generated documentation.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup
 # FIXME: can be removed when https://review.openstack.org/#/c/377314/ is released
 sed -i -e 's/^\s\{4\}git_cmd\(.*\)/    "\/usr\/bin\/true"\1/' doc/source/conf.py

--- a/openstack/python-solumclient/python-solumclient.spec.j2
+++ b/openstack/python-solumclient/python-solumclient.spec.j2
@@ -61,6 +61,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-swiftclient/python-swiftclient.spec.j2
+++ b/openstack/python-swiftclient/python-swiftclient.spec.j2
@@ -40,6 +40,7 @@ This package contains documentation files for %{name}.

 %prep
 %autosetup -n %{sname}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-tackerclient/python-tackerclient.spec.j2
+++ b/openstack/python-tackerclient/python-tackerclient.spec.j2
@@ -53,6 +53,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %{py2_build}
--- a/openstack/python-troveclient/python-troveclient.spec.j2
+++ b/openstack/python-troveclient/python-troveclient.spec.j2
@@ -57,6 +57,7 @@ DBaaS API.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-watcherclient/python-watcherclient.spec.j2
+++ b/openstack/python-watcherclient/python-watcherclient.spec.j2
@@ -51,6 +51,7 @@ This package contains the documentation.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/python-zaqarclient/python-zaqarclient.spec.j2
+++ b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
@@ -55,6 +55,7 @@ Zaqar Queueing API.

 %prep
 %autosetup -n %{name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/stevedore/stevedore.spec.j2
+++ b/openstack/stevedore/stevedore.spec.j2
@@ -49,6 +49,7 @@ This package contains documentation in HTML format.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/taskflow/taskflow.spec.j2
+++ b/openstack/taskflow/taskflow.spec.j2
@@ -76,6 +76,7 @@ This package contains the associated documentation.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/tempest-lib/tempest-lib.spec.j2
+++ b/openstack/tempest-lib/tempest-lib.spec.j2
@@ -37,6 +37,7 @@ OpenStack Functional Testing Library

 %prep
 %autosetup -n tempest-lib-%{version}
+%py_req_cleanup

 %build
 %{__python2} setup.py build
--- a/openstack/tooz/tooz.spec.j2
+++ b/openstack/tooz/tooz.spec.j2
@@ -52,6 +52,7 @@ This package contains documentation in HTML format.

 %prep
 %autosetup -n %{pypi_name}-%{version}
+%py_req_cleanup

 %build
 %py2_build
--- a/openstack/yaql/yaql.spec.j2
+++ b/openstack/yaql/yaql.spec.j2
@@ -36,6 +36,7 @@ written in python and is distributed via PyPI.

 %prep
 %autosetup -n yaql-%{version}
+%py_req_cleanup

 %build
 %py2_build