openstack/rpm-packaging
Code Issues Proposed changes

metalsmith/openstacksdk: Fix Requires for genisoimage/mkisofs

Browse Source 
metalsmith does not require genisoimage - it is openstacksdk which
uses that binary so add the Requires there.
Also do not use genisoimage on openSUSE/SLES. It is not available.
Instead use mkisofs.

Note: This requires https://review.openstack.org/#/c/651193/ in
openstacksdk to work on openSUSE/SLES.

Change-Id: Ifeedca52b8297b576017d7aec88cb4e71cd6b0e9
This commit is contained in:
Thomas Bechtold
2019-04-09 13:23:58 +02:00
parent 883b194411
commit 640e991db7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/metalsmith/metalsmith.spec.j2
View File

@@ -19,7 +19,6 @@ BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('six', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('six', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }}
Requires: genisoimage
Requires: {{ py2pkg('openstacksdk') }} Requires: {{ py2pkg('openstacksdk') }}
Requires: {{ py2pkg('pbr') }} Requires: {{ py2pkg('pbr') }}
Requires: {{ py2pkg('requests') }} Requires: {{ py2pkg('requests') }}

6
openstack/openstacksdk/openstacksdk.spec.j2
View File

@@ -63,7 +63,13 @@ Requires: {{ py2pkg('ipaddress') }}
%if 0%{?suse_version} %if 0%{?suse_version}
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun): update-alternatives
%if 0%{?sle_version} >= 150000
Requires: mkisofs
%else %else
Requires: genisoimage
%endif
%else
Requires: genisoimage
# on RDO, update-alternatives is in chkconfig # on RDO, update-alternatives is in chkconfig
Requires(post): chkconfig Requires(post): chkconfig
Requires(postun): chkconfig Requires(postun): chkconfig