openstack/rpm-packaging
Code Issues Proposed changes

oslo.rootwrap: Move to singlespec

Browse Source 
Also:-
- remove unnecessary BR on reno
- skip 'test_run_as' test with python3
- Also workaround spec-cleaner to convert %{__python3} macro

Change-Id: Ib6e58670c437b741754f9e766a9747695549767c
This commit is contained in:
yatin 2018-06-19 18:37:17 +05:30
parent 405837ae10
commit 72dc905fd9
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,16 +13,16 @@ URL: https://launchpad.net/{{ pypi_name }}
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: python-devel
BuildRequires: {{ py2pkg('eventlet') }}
BuildRequires: {{ py2pkg('fixtures') }}
BuildRequires: {{ py2pkg('mock') }}
BuildRequires: {{ py2pkg('oslotest') }}
BuildRequires: {{ py2pkg('pbr') }}
BuildRequires: {{ py2pkg('python-subunit') }}
BuildRequires: {{ py2pkg('six') }}
BuildRequires: {{ py2pkg('testrepository') }}
BuildRequires: {{ py2pkg('testscenarios') }}
BuildRequires: {{ py2pkg('testtools') }}
BuildRequires: {{ py2pkg('eventlet', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('python-subunit', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('six', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }}
Requires: {{ py2pkg('six') }}
BuildArch: noarch
%if 0%{?suse_version}
@ -30,18 +30,26 @@ BuildRequires: iproute2
%else
BuildRequires: iproute
%endif
%if 0%{?suse_version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
%else
# on RDO, update-alternatives is in chkconfig
Requires(post): chkconfig
Requires(postun): chkconfig
%endif
%python_subpackages
%description
oslo.rootwrap allows fine-grained filtering of shell commands to run as root
from OpenStack services.
%package doc
%package -n {{ py2name() }}-doc
Summary: Documentation for OpenStack {{ pypi_name }}
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('reno') }}
%description doc
%description -n {{ py2name() }}-doc
Documentation for the OpenStack {{ pypi_name }} library.
%prep
@ -50,28 +58,43 @@ Documentation for the OpenStack {{ pypi_name }} library.
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{py2_build}
%{python_build}
# generate html docs
PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{py2_install}
%{python_install}
%python_clone -a %{buildroot}%{_bindir}/oslo-rootwrap
%python_clone -a %{buildroot}%{_bindir}/oslo-rootwrap-daemon
%post
%python_install_alternative oslo-rootwrap
%python_install_alternative oslo-rootwrap-daemon
%postun
%python_uninstall_alternative oslo-rootwrap
%python_uninstall_alternative oslo-daemon
%check
export PYTHONPATH=.
PYTHON=python2 %{__python2} setup.py testr
# FIXME(ykarel) Remove the fix test once it works with python3 under root user
%ifpython3
rm -rf .testrepository
PYTHON=python3 %{__python3} setup.py testr --testr-args='^(?!.*test_run_as)'
%endif
%files
%files %{python_files}
%license LICENSE
%doc ChangeLog README.rst
%{python2_sitelib}/oslo_rootwrap
%{python2_sitelib}/*.egg-info
%{_bindir}/oslo-rootwrap
%{_bindir}/oslo-rootwrap-daemon
%{python_sitelib}/oslo_rootwrap
%{python_sitelib}/*.egg-info
%python_alternative %{_bindir}/oslo-rootwrap
%python_alternative %{_bindir}/oslo-rootwrap-daemon
%files doc
%files -n {{ py2name() }}-doc
%license LICENSE
%doc doc/build/html

4
tools/run_speccleaner.sh
View File

@ -17,9 +17,11 @@ count=0
for spec in $WORKSPACE/logs/suse/*.spec ; do
# NOTE(toabctl):spec-cleaner can not ignore epochs currently
sed -i '/^Epoch:.*/d' $spec
# NOTE(jpena): spec-cleaner wants python2 instead of %{__python2}
# NOTE(jpena): spec-cleaner wants python2/python3 instead of
# %{__python2}/%{__python3}
# https://github.com/openSUSE/spec-cleaner/issues/173
sed -i 's/%{__python2}/python2/g' $spec
sed -i 's/%{__python3}/python3/g' $spec
spec-cleaner -m -d --no-copyright --diff-prog "diff -uw" \
$spec > $tmpdir/`basename ${spec}`.cleaner.diff &
let count+=1