From 668ea019fae63530b0d7f18e3a9beca1193c3aa0 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 28 Jun 2024 09:59:00 -0700
Subject: [PATCH] sync from upstream

---
 prepopulate.json                           | 32 --------------------
 shared/additional_and_filter_packages.conf | 34 ++++++++++++++--------
 2 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index 97df384..e294856 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -274,10 +274,6 @@
       "avahi": [
         "avahi-glib.aarch64"
       ],
-      "babel": [
-        "babel.noarch",
-        "python3-babel.noarch"
-      ],
       "babeltrace": [
         "libbabeltrace.aarch64"
       ],
@@ -7687,10 +7683,6 @@
       "avahi": [
         "avahi-glib.ppc64le"
       ],
-      "babel": [
-        "babel.noarch",
-        "python3-babel.noarch"
-      ],
       "babeltrace": [
         "libbabeltrace.ppc64le"
       ],
@@ -15075,10 +15067,6 @@
       "avahi": [
         "avahi-glib.s390x"
       ],
-      "babel": [
-        "babel.noarch",
-        "python3-babel.noarch"
-      ],
       "babeltrace": [
         "libbabeltrace.s390x"
       ],
@@ -22377,10 +22365,6 @@
       "avahi": [
         "avahi-glib.x86_64"
       ],
-      "babel": [
-        "babel.noarch",
-        "python3-babel.noarch"
-      ],
       "babeltrace": [
         "libbabeltrace.x86_64"
       ],
@@ -31239,7 +31223,6 @@
         "python3-requests.noarch"
       ],
       "python-setuptools": [
-        "python3-setuptools-wheel.noarch",
         "python3-setuptools.noarch"
       ],
       "python-six": [
@@ -32870,7 +32853,6 @@
         "python3-requests.noarch"
       ],
       "python-setuptools": [
-        "python3-setuptools-wheel.noarch",
         "python3-setuptools.noarch"
       ],
       "python-six": [
@@ -34452,7 +34434,6 @@
         "python3-requests.noarch"
       ],
       "python-setuptools": [
-        "python3-setuptools-wheel.noarch",
         "python3-setuptools.noarch"
       ],
       "python-six": [
@@ -36089,7 +36070,6 @@
         "python3-requests.noarch"
       ],
       "python-setuptools": [
-        "python3-setuptools-wheel.noarch",
         "python3-setuptools.noarch"
       ],
       "python-six": [
@@ -38232,9 +38212,6 @@
       "pyparsing": [
         "pyparsing-doc.noarch"
       ],
-      "pyproject-rpm-macros": [
-        "pyproject-rpm-macros.noarch"
-      ],
       "pytest": [
         "python3-pytest.noarch"
       ],
@@ -40495,9 +40472,6 @@
       "pyparsing": [
         "pyparsing-doc.noarch"
       ],
-      "pyproject-rpm-macros": [
-        "pyproject-rpm-macros.noarch"
-      ],
       "pytest": [
         "python3-pytest.noarch"
       ],
@@ -42717,9 +42691,6 @@
       "pyparsing": [
         "pyparsing-doc.noarch"
       ],
-      "pyproject-rpm-macros": [
-        "pyproject-rpm-macros.noarch"
-      ],
       "pytest": [
         "python3-pytest.noarch"
       ],
@@ -45054,9 +45025,6 @@
       "pyparsing": [
         "pyparsing-doc.noarch"
       ],
-      "pyproject-rpm-macros": [
-        "pyproject-rpm-macros.noarch"
-      ],
       "pytest": [
         "python3-pytest.noarch"
       ],
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 31fd918..0225b8f 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -87,6 +87,7 @@ additional_packages = [
             "prefixdevname", #ENGCMP-4041
             "libcpuid", #ENGCMP-4068
             "plocate", #ENGCMP-4074
+            "ktls-utils", #ENGCMP-4189
         ]
     }),
     ("^BaseOS$", {
@@ -434,6 +435,27 @@ additional_packages = [
             "intel-gpu-firmware", #ENGCMP-4150
             "nvidia-gpu-firmware", #ENGCMP-4150
             "pkcs11-provider", #ENGCMP-4181
+            "ptyxis", #ENGCMP-4204
+            "liboqs", #ENGCMP-3895
+            "liboqs-devel", #ENGCMP-3895
+            "python3-pyqt6-devel", #ENGCMP-4144
+            "qt6-qt5compat-devel", #ENGCMP-4144
+            "qt6-qtlanguageserver-devel", #ENGCMP-4144
+            "qt6-qtquick3d-devel", #ENGCMP-4144
+            "qt6-qtquicktimeline-devel", #ENGCMP-4144
+            "qt6-qtremoteobjects-devel", #ENGCMP-4144
+            "qt6-qtscxml-devel", #ENGCMP-4144
+            "qt6-qtserialbus-devel", #ENGCMP-4144
+            "qt6-qtshadertools-devel", #ENGCMP-4144
+            "qt6-qtspeech-devel", #ENGCMP-4144
+            "qt6-qtspeech-speechd", #ENGCMP-4144
+            "qt6-assistant", #ENGCMP-4144
+            "qt6-qdbusviewer", #ENGCMP-4144
+            "qt6-qtwayland-devel", #ENGCMP-4144
+            "qt6-qtwayland", #ENGCMP-4144
+            "glib2-devel", #ENGCMP-4191
+            "plymouth-devel", #ENGCMP-4191
+            "poppler-qt6", #ENGCMP-4191
         ]
     }),
     ("^AppStream$", {
@@ -508,18 +530,6 @@ additional_packages = [
          ],
      }),
 
-    ("^SAP$", {
-        "*": [
-            "compat-sap-c++-12", # ENGCMP-2843
-        ]
-    }),
-
-    ("^SAPHANA$", {
-        "*": [
-            "compat-sap-c++-12", # ENGCMP-2843
-        ]
-    }),
-
     ("^Buildroot$", {
         "*": [
             "*",