From 15669a699f91206af82806a31a8f3508475fdb57 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Apr 14 2022 13:26:17 +0000
Subject: Sync with RHEL-8.7.0


---

diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index da3ca78..3198581 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -64,6 +64,7 @@ additional_packages = [
             "bind9.16-libs", #ENGCMP-1675
             "bind9.16-license", #ENGCMP-1675
             "cockpit-leapp", #ENGCMP-1819
+            "dotnet", #ENGCMP-2144
             "libasan5", #RCM-61474
             "libubsan1",
             "gnome-software-editor",
@@ -141,6 +142,10 @@ additional_packages = [
             "fence-agents-kubevirt", #ENGCMP-2002
             "fence-virtd-cpg", #ENGCMP-1972
             "python3-dnf-plugin-modulesync", #ENGCMP-2018
+            "libzdnn", #ENGCMP-2057
+            "tuned-profiles-postgresql", #ENGCMP-2126
+            "ipxe-bootimgs-aarch64", #ENGCMP-2123
+            "ipxe-bootimgs-x86", #ENGCMP-2123
         ]
     }),
     ("^BaseOS$", {
@@ -162,6 +167,11 @@ additional_packages = [
 
     ("^PowerTools$", {
         "*": [
+            "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
+            "java-17-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
+            "tesseract-devel", # RHELCMP-5762
+            "shadow-utils-subid-devel", #ENGCMP-1597
             "libdnf-devel",
             "librepo-devel",
             "librhsm-devel",
@@ -171,10 +181,6 @@ additional_packages = [
             "dotnet-sdk-3.1-source-built-artifacts",
             "dotnet-sdk-5.0-source-built-artifacts",
             "libcomps-devel", #RhBug 1960616
-            "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
-            "tesseract-devel", # RHELCMP-5762
-            "shadow-utils-subid-devel", #ENGCMP-1597
         ]
     }),
 
@@ -182,16 +188,20 @@ additional_packages = [
         "aarch64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
+            "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-11-openjdk-*fastdebug* " #ENGCMP-2141
         ],
         "ppc64le": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
+            "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-11-openjdk-*fastdebug* " #ENGCMP-2141
         ],
         "x86_64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
+            "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-11-openjdk-*fastdebug* " #ENGCMP-2141
             "dotnet5.0-build-reference-packages",
             "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
         ],
@@ -200,17 +210,6 @@ additional_packages = [
         "x86_64": [
             "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-4189
-            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
-        ],
-        "aarch64": [
-            "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
-        ],
-        "ppc64le": [
-            "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
         ]
     }),
 ]