From 592fd5a16b868f9683e3d0283e2c213f1fd82105 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sep 06 2024 16:31:06 +0000
Subject: Consolidate mariadb packages


---

diff --git a/prepopulate.json b/prepopulate.json
index 75ff914..e28438c 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -3393,6 +3393,9 @@
       "mariadb10.11": [
         "mariadb-backup.aarch64",
         "mariadb-common.aarch64",
+        "mariadb-devel.aarch64",
+        "mariadb-embedded-devel.aarch64",
+        "mariadb-embedded.aarch64",
         "mariadb-errmsg.aarch64",
         "mariadb-gssapi-server.aarch64",
         "mariadb-oqgraph-engine.aarch64",
@@ -3400,6 +3403,7 @@
         "mariadb-server-galera.aarch64",
         "mariadb-server-utils.aarch64",
         "mariadb-server.aarch64",
+        "mariadb-test.aarch64",
         "mariadb.aarch64"
       ],
       "maven": [
@@ -9888,6 +9892,9 @@
       "mariadb10.11": [
         "mariadb-backup.ppc64le",
         "mariadb-common.ppc64le",
+        "mariadb-devel.ppc64le",
+        "mariadb-embedded-devel.ppc64le",
+        "mariadb-embedded.ppc64le",
         "mariadb-errmsg.ppc64le",
         "mariadb-gssapi-server.ppc64le",
         "mariadb-oqgraph-engine.ppc64le",
@@ -9895,6 +9902,7 @@
         "mariadb-server-galera.ppc64le",
         "mariadb-server-utils.ppc64le",
         "mariadb-server.ppc64le",
+        "mariadb-test.ppc64le",
         "mariadb.ppc64le"
       ],
       "maven": [
@@ -16311,6 +16319,9 @@
       "mariadb10.11": [
         "mariadb-backup.s390x",
         "mariadb-common.s390x",
+        "mariadb-devel.s390x",
+        "mariadb-embedded-devel.s390x",
+        "mariadb-embedded.s390x",
         "mariadb-errmsg.s390x",
         "mariadb-gssapi-server.s390x",
         "mariadb-oqgraph-engine.s390x",
@@ -16318,6 +16329,7 @@
         "mariadb-server-galera.s390x",
         "mariadb-server-utils.s390x",
         "mariadb-server.s390x",
+        "mariadb-test.s390x",
         "mariadb.s390x"
       ],
       "maven": [
@@ -22870,6 +22882,9 @@
       "mariadb10.11": [
         "mariadb-backup.x86_64",
         "mariadb-common.x86_64",
+        "mariadb-devel.x86_64",
+        "mariadb-embedded-devel.x86_64",
+        "mariadb-embedded.x86_64",
         "mariadb-errmsg.x86_64",
         "mariadb-gssapi-server.x86_64",
         "mariadb-oqgraph-engine.x86_64",
@@ -22877,6 +22892,7 @@
         "mariadb-server-galera.x86_64",
         "mariadb-server-utils.x86_64",
         "mariadb-server.x86_64",
+        "mariadb-test.x86_64",
         "mariadb.x86_64"
       ],
       "maven": [
@@ -33263,10 +33279,6 @@
         "mariadb-connector-c-doc.noarch",
         "mariadb-connector-c-test.aarch64"
       ],
-      "mariadb10.11": [
-        "mariadb-devel.aarch64",
-        "mariadb-test.aarch64"
-      ],
       "maven-archiver": [
         "maven-archiver.noarch"
       ],
@@ -34987,10 +34999,6 @@
         "mariadb-connector-c-doc.noarch",
         "mariadb-connector-c-test.ppc64le"
       ],
-      "mariadb10.11": [
-        "mariadb-devel.ppc64le",
-        "mariadb-test.ppc64le"
-      ],
       "maven-archiver": [
         "maven-archiver.noarch"
       ],
@@ -36750,10 +36758,6 @@
         "mariadb-connector-c-doc.noarch",
         "mariadb-connector-c-test.s390x"
       ],
-      "mariadb10.11": [
-        "mariadb-devel.s390x",
-        "mariadb-test.s390x"
-      ],
       "maven-archiver": [
         "maven-archiver.noarch"
       ],
@@ -38537,10 +38541,6 @@
         "mariadb-connector-c-doc.noarch",
         "mariadb-connector-c-test.x86_64"
       ],
-      "mariadb10.11": [
-        "mariadb-devel.x86_64",
-        "mariadb-test.x86_64"
-      ],
       "maven-archiver": [
         "maven-archiver.noarch"
       ],
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 3ff9b68..5d25e18 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -326,9 +326,6 @@ additional_packages = [
             "dnsconfd-unbound", #ENGCMP-4213
             "ipa-selinux-nfast", #ENGCMP-4146
             "ipa-selinux-luna", #ENGCMP-4146
-            "mariadb-devel", #ENGCMP-4202
-            "mariadb-embedded-devel", #ENGCMP-4202
-            "mariadb-test", #ENGCMP-4202
             "xwayland-run", #ENGCMP-4249
             "cockpit-files", #ENGCMP-4256
             "udev-hid-bpf", #ENGCMP-4264