From 72281c54e92ef2d6d768231fd6c363d814167169 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Sep 07 2021 22:19:11 +0000
Subject: Sync with RHEL 8.5


---

diff --git a/multilib.conf b/multilib.conf
index 59d51b9..a31ac14 100644
--- a/multilib.conf
+++ b/multilib.conf
@@ -8,7 +8,7 @@ multilib_blacklist = {
         "fwupd*", # RCM-76022
         "gcc-toolset-10-systemtap*", # Jira: RHELCMP-1270
         "gcc-toolset-10-dyninst-*", # Jira: RHELCMP-2173
-        "sblim-gather-*",
+        "sblim-gather*", # Jira: RHELCMP-6212
         "gcc-toolset-11-dyninst-devel" # Jira: RHELCMP-6377
     ],
 }
diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index 70e77fd..4612ea2 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -154,6 +154,7 @@ additional_packages = [
             "pcm", # RHELCMP-6356
             "jigawatts", # RHELCMP-6427
             "udica", # RHELCMP-6453
+            "jigawatts-javadoc", # RHELCMP-6427
         ]
     }),
     ("^BaseOS$", {