From 8ac1ef8247daaf13ed961f8f89eaaaa71d0bc7229140100e5b63a66ae7780375 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2018 13:41:34 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=197 --- openscap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscap.spec b/openscap.spec index 5ea2221..e2b3b97 100644 --- a/openscap.spec +++ b/openscap.spec @@ -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 From 4812708f172a5ba92b3af436b6b49e41402ac2ed19f51472d33aaed72707fb8b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2018 13:41:50 +0000 Subject: [PATCH 2/5] - disable scap-as-rpm binary to avoid python2 dependency. OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=198 --- openscap.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openscap.changes b/openscap.changes index f2d4e55..db22935 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 13:41:36 UTC 2018 - meissner@suse.com + +- disable scap-as-rpm binary to avoid python2 dependency. + ------------------------------------------------------------------- Thu Nov 23 13:44:24 UTC 2017 - rbrown@suse.com From 0102e47e88118d797d7a381034224fdfcc03d2dd9267e39f39a94b89b24eafb0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2018 13:59:55 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=199 --- openscap.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openscap.spec b/openscap.spec index e2b3b97..db9eb3a 100644 --- a/openscap.spec +++ b/openscap.spec @@ -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 From 67516938ac10d3f7357ee53f2adef3804cf76d31189ecb977d9884839e2a3298 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2018 14:50:12 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=200 --- openscap.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openscap.spec b/openscap.spec index db9eb3a..52b03a9 100644 --- a/openscap.spec +++ b/openscap.spec @@ -306,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 From 078a8851d457ed0b827f3c7b9668e90218ea1ce615df4b99de470b82e8d43b65 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2018 15:23:58 +0000 Subject: [PATCH 5/5] - disable scap-as-rpm binary to avoid python2 dependency. (bsc#1082135) OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=201 --- openscap.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscap.changes b/openscap.changes index db22935..58efb29 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Feb 22 13:41:36 UTC 2018 - meissner@suse.com -- disable scap-as-rpm binary to avoid python2 dependency. +- disable scap-as-rpm binary to avoid python2 dependency. (bsc#1082135) ------------------------------------------------------------------- Thu Nov 23 13:44:24 UTC 2017 - rbrown@suse.com