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


---

diff --git a/prepopulate.json b/prepopulate.json
index dca8d1b..75ff914 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -4804,11 +4804,17 @@
       ],
       "postgresql16": [
         "postgresql-contrib.aarch64",
+        "postgresql-docs.aarch64",
         "postgresql-plperl.aarch64",
         "postgresql-plpython3.aarch64",
         "postgresql-pltcl.aarch64",
+        "postgresql-private-devel.aarch64",
         "postgresql-private-libs.aarch64",
+        "postgresql-server-devel.aarch64",
         "postgresql-server.aarch64",
+        "postgresql-static.aarch64",
+        "postgresql-test.aarch64",
+        "postgresql-upgrade-devel.aarch64",
         "postgresql-upgrade.aarch64",
         "postgresql.aarch64"
       ],
@@ -11282,11 +11288,17 @@
       ],
       "postgresql16": [
         "postgresql-contrib.ppc64le",
+        "postgresql-docs.ppc64le",
         "postgresql-plperl.ppc64le",
         "postgresql-plpython3.ppc64le",
         "postgresql-pltcl.ppc64le",
+        "postgresql-private-devel.ppc64le",
         "postgresql-private-libs.ppc64le",
+        "postgresql-server-devel.ppc64le",
         "postgresql-server.ppc64le",
+        "postgresql-static.ppc64le",
+        "postgresql-test.ppc64le",
+        "postgresql-upgrade-devel.ppc64le",
         "postgresql-upgrade.ppc64le",
         "postgresql.ppc64le"
       ],
@@ -17683,11 +17695,17 @@
       ],
       "postgresql16": [
         "postgresql-contrib.s390x",
+        "postgresql-docs.s390x",
         "postgresql-plperl.s390x",
         "postgresql-plpython3.s390x",
         "postgresql-pltcl.s390x",
+        "postgresql-private-devel.s390x",
         "postgresql-private-libs.s390x",
+        "postgresql-server-devel.s390x",
         "postgresql-server.s390x",
+        "postgresql-static.s390x",
+        "postgresql-test.s390x",
+        "postgresql-upgrade-devel.s390x",
         "postgresql-upgrade.s390x",
         "postgresql.s390x"
       ],
@@ -24275,11 +24293,17 @@
       ],
       "postgresql16": [
         "postgresql-contrib.x86_64",
+        "postgresql-docs.x86_64",
         "postgresql-plperl.x86_64",
         "postgresql-plpython3.x86_64",
         "postgresql-pltcl.x86_64",
+        "postgresql-private-devel.x86_64",
         "postgresql-private-libs.x86_64",
+        "postgresql-server-devel.x86_64",
         "postgresql-server.x86_64",
+        "postgresql-static.x86_64",
+        "postgresql-test.x86_64",
+        "postgresql-upgrade-devel.x86_64",
         "postgresql-upgrade.x86_64",
         "postgresql.x86_64"
       ],
@@ -33677,11 +33701,6 @@
         "poppler-qt6-devel.aarch64",
         "poppler-qt6.aarch64"
       ],
-      "postgresql16": [
-        "postgresql-private-devel.aarch64",
-        "postgresql-server-devel.aarch64",
-        "postgresql-test.aarch64"
-      ],
       "ppp": [
         "ppp-devel.aarch64"
       ],
@@ -35463,11 +35482,6 @@
         "poppler-qt6-devel.ppc64le",
         "poppler-qt6.ppc64le"
       ],
-      "postgresql16": [
-        "postgresql-private-devel.ppc64le",
-        "postgresql-server-devel.ppc64le",
-        "postgresql-test.ppc64le"
-      ],
       "ppp": [
         "ppp-devel.ppc64le"
       ],
@@ -37228,11 +37242,6 @@
         "poppler-qt6-devel.s390x",
         "poppler-qt6.s390x"
       ],
-      "postgresql16": [
-        "postgresql-private-devel.s390x",
-        "postgresql-server-devel.s390x",
-        "postgresql-test.s390x"
-      ],
       "ppp": [
         "ppp-devel.s390x"
       ],
@@ -39070,11 +39079,6 @@
         "poppler-qt6-devel.x86_64",
         "poppler-qt6.x86_64"
       ],
-      "postgresql16": [
-        "postgresql-private-devel.x86_64",
-        "postgresql-server-devel.x86_64",
-        "postgresql-test.x86_64"
-      ],
       "ppp": [
         "ppp-devel.x86_64"
       ],
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index c4a2ae3..3ff9b68 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -326,16 +326,9 @@ additional_packages = [
             "dnsconfd-unbound", #ENGCMP-4213
             "ipa-selinux-nfast", #ENGCMP-4146
             "ipa-selinux-luna", #ENGCMP-4146
-            "postgresql-docs", #ENGCMP-4202
-            "postgresql-static", #ENGCMP-4202
-            "postgresql-server-devel", #ENGCMP-4202
-            "postgresql-upgrade-devel", #ENGCMP-4202
-            "postgresql-private-devel", #ENGCMP-4202
-            "postgresql-test", #ENGCMP-4202
             "mariadb-devel", #ENGCMP-4202
             "mariadb-embedded-devel", #ENGCMP-4202
             "mariadb-test", #ENGCMP-4202
-            "postgresql-private-libs", #ENGCMP-4203
             "xwayland-run", #ENGCMP-4249
             "cockpit-files", #ENGCMP-4256
             "udev-hid-bpf", #ENGCMP-4264