openstack/rpm-packaging
Code Issues Proposed changes

Merge "Use %py_build and %py_install macros"

Browse Source
This commit is contained in:
Jenkins 2016-07-27 21:32:48 +00:00 committed by Gerrit Code Review
commit dbe68cd030
27 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/bareon/Bareon.spec.j2
View File

@ -76,7 +76,7 @@ Documentation for OpenStack bareon tool.
%setup -q -n %{sname}-%{sversion}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
# remove the sphinx-build leftovers
@ -84,7 +84,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
mkdir -p %{buildroot}/%{_sysconfdir}/bareon
mkdir -p %{buildroot}%{_datadir}/%{sname}/cloud-init-templates
install -p -D -m 640 etc/bareon/bareon.conf.sample %{buildroot}/%{_sysconfdir}/bareon/bareon.conf

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

@ -56,10 +56,10 @@ Documentation for OpenStack authenticating tools.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
# generate html docs
%{__python2} setup.py build_sphinx

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

@ -67,7 +67,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -75,7 +75,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
# move usr/etc to etc
mv %{buildroot}%{_prefix}%{_sysconfdir}/* %{buildroot}/%{_sysconfdir}/

4
openstack/os-client-config/os-client-config.spec.j2
View File

@ -55,7 +55,7 @@ Documentation for the os-client-config library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%if %{with docs}
# generate html docs
%{__python2} setup.py build_sphinx
@ -64,7 +64,7 @@ rm -rf html/.{doctrees,buildinfo}
%endif
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
%if %{with test}
%check

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

@ -40,7 +40,7 @@ Documentation for the testr wrapper.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -48,7 +48,7 @@ Documentation for the testr wrapper.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check

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

@ -53,12 +53,12 @@ Documentation for the Hyper-V library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%{__python2} setup.py build_sphinx
rm -rf html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
install -p -D -m 644 doc/build/man/os-win.1 %{buildroot}/%{_mandir}/man1/os-win.1
%check

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

@ -47,10 +47,10 @@ Documentation for the OpenStack Oslo cache library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
# generate html docs
%{__python2} setup.py build_sphinx

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

@ -53,7 +53,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -61,7 +61,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
# Test suite fails on 32 bit platforms

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

@ -53,14 +53,14 @@ Documentation for the oslo-config library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%{__python2} setup.py build_sphinx
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -34,14 +34,14 @@ Documentation for the oslo-context library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
%if %{with test}
%check

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

@ -62,7 +62,7 @@ Documentation for the Oslo database handling library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -70,7 +70,7 @@ Documentation for the Oslo database handling library.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -33,10 +33,10 @@ Documentation for the oslo.i18n library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
# generate html docs
%{__python2} setup.py build_sphinx

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

@ -52,14 +52,14 @@ Documentation for the oslo.log library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
%check
testr init && testr run --parallel

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

@ -85,7 +85,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -93,7 +93,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -56,7 +56,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -64,7 +64,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -43,7 +43,7 @@ Documentation for the Oslo Policy library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -51,7 +51,7 @@ Documentation for the Oslo Policy library.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -46,7 +46,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -54,7 +54,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -43,14 +43,14 @@ Documentation for the oslo.rootwrap library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
%check
export PYTHONPATH=.

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

@ -41,7 +41,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -49,7 +49,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py test

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

@ -64,7 +64,7 @@ This package contains the documentation.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
@ -72,7 +72,7 @@ This package contains the documentation.
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -53,10 +53,10 @@ Documentation for OpenStack utils library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
# generate html docs
%{__python2} setup.py build_sphinx

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

@ -56,11 +56,11 @@ This package contains documentation files for %{name}.
%setup -q -n oslo.versionedobjects-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%{__python2} setup.py build_sphinx && rm doc/build/html/.buildinfo
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py testr

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

@ -24,10 +24,10 @@ layer of Sphinx plugins.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} --install-data=%{python2_sitelib}
%{py2_install}
%files
%doc README.rst AUTHORS

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

@ -37,10 +37,10 @@ better support for mocking results.
%setup -q -n oslotest-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{py2_install}
%check
%{__python2} setup.py test

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

@ -43,10 +43,10 @@ Documentation for OSProfiler.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
%{py2_install}
# generate html docs
%{__python2} setup.py build_sphinx

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

@ -33,14 +33,14 @@ Documentation for python module name to package name map library.
%setup -q -n %{sname}-%{version}
%build
%{__python2} setup.py build
%{py2_build}
# generate html docs
%{__python2} setup.py build_sphinx
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{__python2} setup.py install --prefix=%{_prefix} --skip-build --root %{buildroot}
%{py2_install}
%check
%{__python2} setup.py test

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

@ -58,13 +58,13 @@ Identity API.
sed '/^html_last_updated_fmt.*/,/.)/ s/^/#/' -i doc/source/conf.py
%build
%{__python2} setup.py build
%{py2_build}
# Build HTML docs and man page
%{__python2} setup.py build_sphinx
%install
%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
%{py2_install}
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/tests