From 841f9c8c2db850ed914fc01efd94216d89ff650d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 01 2022 17:39:58 +0000
Subject: import oscap-anaconda-addon-2.0.0-7.el9


---

diff --git a/SOURCES/oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch b/SOURCES/oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch
new file mode 100644
index 0000000..b94a864
--- /dev/null
+++ b/SOURCES/oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch
@@ -0,0 +1,39 @@
+From 20843d815a82d10cba773f4e10e9a45c57d5e12e Mon Sep 17 00:00:00 2001
+From: Vendula Poncova <vponcova@redhat.com>
+Date: Wed, 18 Aug 2021 10:54:20 +0200
+Subject: [PATCH] Don't show the OSCAP spoke if the OSCAP DBus module is
+ disabled
+
+Add-ons can be disabled in the Anaconda configuration files. Without the fix,
+the OSCAP DBus module is started on demand by the OSCAP spoke even though it
+shouldn't be activated. In the future, it will result in a failure of the
+installer.
+
+Related: rhbz#1994003
+---
+ org_fedora_oscap/gui/spokes/oscap.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
+index 36c8d7a..fe26076 100644
+--- a/org_fedora_oscap/gui/spokes/oscap.py
++++ b/org_fedora_oscap/gui/spokes/oscap.py
+@@ -36,6 +36,7 @@
+ from org_fedora_oscap.structures import PolicyData
+ 
+ from pyanaconda.modules.common.constants.services import USERS
++from pyanaconda.modules.common.util import is_module_available
+ from pyanaconda.threading import threadMgr, AnacondaThread
+ from pyanaconda.ui.gui.spokes import NormalSpoke
+ from pyanaconda.ui.communication import hubQ
+@@ -203,6 +204,10 @@ class OSCAPSpoke(NormalSpoke):
+     # as it is displayed inside the spoke as the spoke label,
+     # and spoke labels are all uppercase by a convention.
+ 
++    @classmethod
++    def should_run(cls, environment, data):
++        return is_module_available(OSCAP)
++
+     # methods defined by API and helper methods #
+     def __init__(self, data, storage, payload):
+         """
diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec
index b5fccf6..7f092c1 100644
--- a/SPECS/oscap-anaconda-addon.spec
+++ b/SPECS/oscap-anaconda-addon.spec
@@ -10,7 +10,7 @@
 
 Name:           oscap-anaconda-addon
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Anaconda addon integrating OpenSCAP to the installation process
 
 License:        GPLv2+
@@ -26,6 +26,7 @@ Patch3: 	oscap-anaconda-addon-2.0.1-fix_archive_handling-PR_170.patch
 Patch4: 	oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch
 Patch5: 	oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch
 Patch6: 	oscap-anaconda-addon-2.0.1-rhel9_tailoring_fix-PR_180.patch
+Patch7: 	oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch
 
 BuildArch:      noarch
 BuildRequires:  make
@@ -65,6 +66,10 @@ make install DESTDIR=%{buildroot}
 %doc COPYING ChangeLog README.md
 
 %changelog
+* Mon Dec 13 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-7
+- Don't show the OSCAP spoke if the OSCAP DBus module is disabled
+  Resolves: rhbz#2018954
+
 * Thu Nov 25 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-6
 - Fix handling of tailoring in RHEL9
   Resolves: rhbz#1996129