rpm/openscap
SHA256
1
0
Fork 0
forked from pool/openscap
Code Pull Requests Activity

Accepting request 579041 from security

Browse Source 
- disable scap-as-rpm binary to avoid python2 dependency. (bsc#1082135)

OBS-URL: https://build.opensuse.org/request/show/579041
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=54
This commit is contained in:
Dominique Leuenberger 2018-02-23 14:29:34 +00:00 committed by Git OBS Bridge
commit 7a541fe677
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openscap.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 22 13:41:36 UTC 2018 - meissner@suse.com
- disable scap-as-rpm binary to avoid python2 dependency. (bsc#1082135)
-------------------------------------------------------------------
Thu Nov 23 13:44:24 UTC 2017 - rbrown@suse.com

8
openscap.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package openscap
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -192,6 +192,9 @@ make check %{?_smp_mflags} || :
make install DESTDIR=%{buildroot}
find %{buildroot} -name "*.la" -delete
# last python2 user in oscap-utils ... needs porting to python3
rm %{buildroot}/usr/bin/scap-as-rpm
mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/oscap-scan
@ -303,7 +306,8 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/
%{_bindir}/oscap-vm
%{_bindir}/oscap-ssh
%{_bindir}/oscap-chroot
%{_bindir}/scap-as-rpm
# currently not shipped as it is still python2
#{_bindir}/scap-as-rpm
%config %{_sysconfdir}/bash_completion.d/*
%files content