Dont package .pickl file

because it is not needed and will cause packages to differ for every build.

See https://reproducible-builds.org/ for why this matters.

Also dont use rm -f so we notice when we use the wrong path

Change-Id: Iea324d8d2ec2723b567270379c056d29a39e375f

openstack/aodhclient/aodhclient.spec.j2

@@ -62,7 +62,7 @@ This package contains auto-generated documentation.
 
 PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
 # Fix hidden-file-or-dir warnings
-rm -rf html/.doctrees html/.buildinfo
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %check
 # FIXME: only run unittests for now.

openstack/cyborg/cyborg.spec.j2

@@ -121,6 +121,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
 PBR_VERSION={{ upstream_version }} sphinx-build -b man doc/source doc/build/man
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 # config file generation
 PYTHONPATH=. oslo-config-generator --config-file tools/config/cyborg-config-generator.conf \

openstack/monasca-statsd/monasca-statsd.spec.j2

@@ -31,6 +31,7 @@ Python Statsd library for sending statsd messages via the Monasca Agent
 %build
 %{py2_build}
 PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %{py2_install}

openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2

@@ -67,6 +67,7 @@ This package contains documentation files for %{name}.
 %{python_build}
 
 PYTHONPATH=. sphinx-build -b html doc/source doc/build/html
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %{python_install}

openstack/python-freezerclient/python-freezerclient.spec.j2

@@ -68,7 +68,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 # Build HTML docs and man page
 PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
-rm -rf html/.{doctrees,buildinfo}
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %{python_install}

openstack/python-magnumclient/python-magnumclient.spec.j2

@@ -84,7 +84,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 # Build HTML docs and man page
 PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
 PBR_VERSION={{ upstream_version }} sphinx-build -b man doc/source doc/build/man
-rm -rf html/.{doctrees,buildinfo}
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %{python_install}

openstack/python-muranoclient/python-muranoclient.spec.j2

@@ -71,6 +71,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 # Build HTML docs and man page
 PBR_VERSION=%version sphinx-build -b html doc/source doc/build/html
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %py2_install

openstack/python-neutronclient/python-neutronclient.spec.j2

@@ -90,6 +90,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 # Build HTML docs and man page
 PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
 PBR_VERSION={{ upstream_version }} sphinx-build -b man doc/source doc/build/man
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %{python_install}

openstack/python-troveclient/python-troveclient.spec.j2

@@ -64,7 +64,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 # Generate html docs
 PBR_VERSION=%version sphinx-build -b html doc/source doc/build/html
 # Remove the Sphinx-build leftovers
-rm -rf html/.{doctrees,buildinfo}
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %py2_install

openstack/python-zaqarclient/python-zaqarclient.spec.j2

@@ -63,6 +63,7 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 # Build HTML docs and man page
 PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
+rm -r doc/build/html/.{doctrees,buildinfo}
 
 %install
 %py2_install