rpms/oscap-anaconda-addon
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove the redundant dependency on oscap-utils

Browse Source 
Resolves: rhbz#2086822
This commit is contained in:
Matej Tyc 2022-06-01 11:59:37 +02:00
parent 1f08ba4586
commit df2813a58a
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
oscap-anaconda-addon-1.3.0-no_oscap_utils-PR_209.patch Normal file
View File

@ -0,0 +1,26 @@
From 8fb70b5a5883aac7da3f0e7e1a18dcf141993f42 Mon Sep 17 00:00:00 2001
From: Matej Tyc <matyc@redhat.com>
Date: Mon, 23 May 2022 14:05:27 +0200
Subject: [PATCH] Remove oscap-utils dependency
oscap-utils package is not related to the firstboot remediation,
everything will continue to work even without it being an installation requirement
---
org_fedora_oscap/service/installation.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/org_fedora_oscap/service/installation.py b/org_fedora_oscap/service/installation.py
index d79cce9..29d53a8 100644
--- a/org_fedora_oscap/service/installation.py
+++ b/org_fedora_oscap/service/installation.py
@@ -31,8 +31,8 @@
log = logging.getLogger("anaconda")
-# scanner is useful for the post remediation, utils for the firstboot remediation
-REQUIRED_PACKAGES = ("openscap", "openscap-scanner", "openscap-utils",)
+# scanner is useful for the post remediation
+REQUIRED_PACKAGES = ("openscap", "openscap-scanner")
def _handle_error(exception):

7
oscap-anaconda-addon.spec
View File

@ -10,7 +10,7 @@
Name: oscap-anaconda-addon
Version: 2.0.0
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Anaconda addon integrating OpenSCAP to the installation process
License: GPLv2+
@ -32,6 +32,7 @@ Patch9: oscap-anaconda-addon-2.0.1-absent_appstream-PR_185.patch
Patch10: oscap-anaconda-addon-2.1.0-firstboot-PR_189.patch
Patch11: oscap-anaconda-addon-1.3.0-fix_dsid-PR_194.patch
Patch12: oscap-anaconda-addon-2.0.1-fix_strings-PR_207.patch
Patch13: oscap-anaconda-addon-1.3.0-no_oscap_utils-PR_209.patch
BuildArch: noarch
BuildRequires: make
@ -71,6 +72,10 @@ make install DESTDIR=%{buildroot}
%doc COPYING ChangeLog README.md
%changelog
* Wed Jun 01 2022 Matej Tyc <matyc@redhat.com> - 2.0.0-11
- Remove the redundant dependency on oscap-utils
Resolves: rhbz#2086822
* Wed May 18 2022 Matej Tyc <matyc@redhat.com> - 2.0.0-10
- Fix strings, so they are translatable, and update translations
Resolves: rhbz#2081268