From 2656f49727089fa92e002932f9dd68e1c1856f1d Mon Sep 17 00:00:00 2001
From: Patrick Schratz <patrick.schratz@gmail.com>
Date: Tue, 30 Jul 2024 17:05:25 +0200
Subject: [PATCH 1/2] redhat8-postgresql-devel

---
 rules/postgresql.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules/postgresql.json b/rules/postgresql.json
index 8d35115..a7c2464 100644
--- a/rules/postgresql.json
+++ b/rules/postgresql.json
@@ -25,7 +25,7 @@
         {
           "os": "linux",
           "distribution": "redhat",
-          "versions": ["6", "7"]
+          "versions": ["6", "7", "8"]
         }
       ]
     },
@@ -37,11 +37,6 @@
           "distribution": "centos",
           "versions": ["8"]
         },
-        {
-          "os": "linux",
-          "distribution": "redhat",
-          "versions": ["8"]
-        },
         {
           "os": "linux",
           "distribution": "fedora"

From 780976259c57e74a54c4bc78ba7db0923795436b Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@posit.co>
Date: Tue, 30 Jul 2024 17:53:17 -0500
Subject: [PATCH 2/2] Fix postgresql package for other RHEL/Rocky/Fedora
 distros

---
 rules/postgresql.json | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/rules/postgresql.json b/rules/postgresql.json
index a7c2464..1a0e65c 100644
--- a/rules/postgresql.json
+++ b/rules/postgresql.json
@@ -25,12 +25,12 @@
         {
           "os": "linux",
           "distribution": "redhat",
-          "versions": ["6", "7", "8"]
+          "versions": ["6", "7"]
         }
       ]
     },
     {
-      "packages": ["postgresql-server-devel"],
+      "packages": ["libpq-devel"],
       "constraints": [
         {
           "os": "linux",
@@ -39,33 +39,16 @@
         },
         {
           "os": "linux",
-          "distribution": "fedora"
-        }
-      ]
-    },
-    {
-      "packages": ["postgresql-server-devel"],
-      "pre_install": [
-        { "command": "dnf install -y dnf-plugins-core" },
-        { "command": "dnf config-manager --set-enabled crb" }
-      ],
-      "constraints": [
+          "distribution": "redhat",
+          "versions": ["8", "9"]
+        },
         {
           "os": "linux",
           "distribution": "rockylinux"
-        }
-      ]
-    },
-    {
-      "packages": ["postgresql-server-devel"],
-      "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" }
-      ],
-      "constraints": [
+        },
         {
           "os": "linux",
-          "distribution": "redhat",
-          "versions": ["9"]
+          "distribution": "fedora"
         }
       ]
     },