openstack
/
rpm-packaging
Code Issues Proposed changes

Merge "Fix build without git being installed in build env"

This commit is contained in:
Zuul 2019-04-24 05:18:59 +00:00 committed by Gerrit Code Review
parent 22c2ca908b 4f65b56dcd
commit 7cd1bcd8dd
22 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/automaton/automaton.spec.j2
View File

@ -44,7 +44,7 @@ Documentation for the Automaton library.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the Sphinx-build leftovers
rm -rf html/.{doctrees,buildinfo}

4
openstack/castellan/castellan.spec.j2
View File

@ -45,7 +45,7 @@ Generic Key Manager interface for OpenStack.
Summary: Documentation for castellan
Group: Documentation/HTML
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }}
%description -n python-castellan-doc
Castellan is a generic Key Manager interface for OpenStack.
@ -58,7 +58,7 @@ This package contains the documentation
%build
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf html/.{doctrees,buildinfo}

2
openstack/debtcollector/debtcollector.spec.j2
View File

@ -62,7 +62,7 @@ This package contains documentation in HTML format.
%python_build
# generate html doc
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the Sphinx-build leftovers
rm -rf html/.{doctrees,buildinfo}

4
openstack/keystoneauth1/keystoneauth1.spec.j2
View File

@ -48,7 +48,7 @@ Tools for authenticating to an OpenStack-based cloud. These tools include:
%package -n python-keystoneauth1-doc
Summary: Documentation for OpenStack authenticating tools
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }}
%description -n python-keystoneauth1-doc
Documentation for OpenStack authenticating tools.
@ -67,7 +67,7 @@ echo "intersphinx_mapping = {}" >> doc/source/conf.py
%{python_install}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

4
openstack/os-brick/os-brick.spec.j2
View File

@ -61,7 +61,7 @@ Features:
%package -n {{ py2name() }}-doc
Summary: Documentation for OpenStack os-brick library
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }}
%description -n {{ py2name() }}-doc
OpenStack Cinder brick library for managing local volume attaches.
@ -84,7 +84,7 @@ Configuration files for the OpenStack Cinder brick library.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/os-service-types/os-service-types.spec.j2
View File

@ -56,7 +56,7 @@ rm os_service_types/tests/test_remote.py
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.concurrency/oslo.concurrency.spec.j2
View File

@ -70,7 +70,7 @@ This package contains the documentation.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.context/oslo.context.spec.j2
View File

@ -46,7 +46,7 @@ Documentation for the oslo-context library.
%build
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

4
openstack/oslo.db/oslo.db.spec.j2
View File

@ -62,7 +62,7 @@ to the different backends and helper utils.
Summary: Documentation for the Oslo database handling library
Group: Documentation/HTML
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }}
%description -n {{ py2name() }}-doc
Documentation for the Oslo database handling library.
@ -75,7 +75,7 @@ Documentation for the Oslo database handling library.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.i18n/oslo.i18n.spec.j2
View File

@ -47,7 +47,7 @@ Documentation for the oslo.i18n library.
%{python_install}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

6
openstack/oslo.messaging/oslo.messaging.spec.j2
View File

@ -108,9 +108,9 @@ rm -f oslo_messaging/tests/drivers/test_amqp_driver.py
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf build/sphinx/html/.{doctrees,buildinfo}
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{python_install}
@ -134,6 +134,6 @@ rm -rf build/sphinx/html/.{doctrees,buildinfo}
%files -n {{ py2name() }}-doc
%license LICENSE
%doc build/sphinx/html
%doc doc/build/html
%changelog

2
openstack/oslo.middleware/oslo.middleware.spec.j2
View File

@ -71,7 +71,7 @@ This package contains the documentation.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.policy/oslo.policy.spec.j2
View File

@ -63,7 +63,7 @@ Documentation for the Oslo Policy library.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.privsep/oslo.privsep.spec.j2
View File

@ -69,7 +69,7 @@ Documentation for oslo.privsep
%build
%python_build
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.reports/oslo.reports.spec.j2
View File

@ -57,7 +57,7 @@ This package contains the documentation.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.serialization/oslo.serialization.spec.j2
View File

@ -52,7 +52,7 @@ sed -i -e "s,bandit.*,," test-requirements.txt
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.service/oslo.service.spec.j2
View File

@ -79,7 +79,7 @@ This package contains the documentation.
%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

1
openstack/oslo.utils/oslo.utils.spec.j2
View File

@ -67,7 +67,6 @@ Documentation for OpenStack utils library.
%python_install
# generate html docs
#%{__python2} setup.py build_sphinx
PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/oslo.vmware/oslo.vmware.spec.j2
View File

@ -77,7 +77,7 @@ Documentation for OpenStack common VMware library.
%python_build
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/osprofiler/osprofiler.spec.j2
View File

@ -75,7 +75,7 @@ Documentation for OSProfiler.
%python_clone -a %{buildroot}%{_bindir}/osprofiler
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

2
openstack/python-keystoneclient/python-keystoneclient.spec.j2
View File

@ -65,7 +65,7 @@ echo "intersphinx_mapping = {}" >> doc/source/conf.py
%{python_build}
# Build HTML docs and man page
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
%install
%{python_install}

2
openstack/taskflow/taskflow.spec.j2
View File

@ -97,7 +97,7 @@ sed -i /networkx.drawing/d taskflow/types/graph.py
%{python_install}
# generate html docs
%{__python2} setup.py build_sphinx
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}