From f35bf00ac02cbd0ae066658e5c48c367713e7e3c4ccf3540bf90637e8889f69d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 7 Oct 2021 07:59:39 +0000 Subject: [PATCH 1/3] Accepting request 923072 from home:msmeissn:branches:security - readjust python3 requirements for python3 to be on sles12 sp5 and newer. OBS-URL: https://build.opensuse.org/request/show/923072 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=266 --- openscap.changes | 6 ++++++ openscap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openscap.changes b/openscap.changes index 8f6a193..b7c7e3d 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 4 15:33:23 UTC 2021 - Marcus Meissner + +- readjust python3 requirements for python3 to be on sles12 sp5 + and newer. + ------------------------------------------------------------------- Thu Aug 19 04:51:24 UTC 2021 - Steve Kowalik diff --git a/openscap.spec b/openscap.spec index 6016015..685d814 100644 --- a/openscap.spec +++ b/openscap.spec @@ -266,7 +266,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml %{buildroot}/%{_datadir}/ope %files docker %defattr(-, root, root) -%if 0%{?suse_version} >= 1500 +%if 0%{?suse_version} >= 1250 %{python3_sitelib}/oscap_docker_python %else %{python_sitelib}/oscap_docker_python From 14b3ae9893ab0c60f9b858594e3764b674118e7b6f73de5fe8a237afa9a9ad56 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 8 Oct 2021 11:19:47 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=267 --- openscap.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openscap.spec b/openscap.spec index 685d814..87f99bb 100644 --- a/openscap.spec +++ b/openscap.spec @@ -266,11 +266,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml %{buildroot}/%{_datadir}/ope %files docker %defattr(-, root, root) -%if 0%{?suse_version} >= 1250 %{python3_sitelib}/oscap_docker_python -%else -%{python_sitelib}/oscap_docker_python -%endif %{_bindir}/oscap-docker %if 0%{?with_bindings} From 0b1bd89f4fe35edb4af1fdf33c84042980090417f67f69a3c298f26317b179ff Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 8 Oct 2021 11:23:26 +0000 Subject: [PATCH 3/3] - ship python3 docker module always OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=268 --- openscap.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openscap.changes b/openscap.changes index b7c7e3d..f7b76de 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Mon Oct 4 15:33:23 UTC 2021 - Marcus Meissner -- readjust python3 requirements for python3 to be on sles12 sp5 - and newer. +- ship python3 docker module always ------------------------------------------------------------------- Thu Aug 19 04:51:24 UTC 2021 - Steve Kowalik