From 94d6b85d721a775914600443df6887034074b8cc Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Thu, 22 Dec 2022 11:21:21 +0000
Subject: [PATCH] Include libpq development packages in the repos. (#5667)

While we're at it:
- Automatically find the latest PostgreSQL installation on EL/Fedora
- Use libpq5 on EL/Fedora, not postgresql-libs.

Fixes #5650
---
 pkg/debian/build.sh | 2 +-
 pkg/redhat/build.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index 60833faeb..c92e5c7ec 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -122,7 +122,7 @@ fakeroot dpkg-deb --build "${METAROOT}" "${DISTROOT}/${APP_NAME}_${APP_LONG_VERS
 
 # Get the libpq package
 pushd "${DISTROOT}" 1> /dev/null
-apt-get download libpq5
+apt-get download libpq5 libpq-dev
 popd 1> /dev/null
 
 echo "Completed. DEBs created in ${DISTROOT}."
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index 8e6287036..342b1f4f3 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -9,8 +9,8 @@ trap 'ERRCODE=$? && if [ ${ERRCODE} -ne 0 ]; then echo "The command \"${BASH_COM
 OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g')
 OS_ARCH=$(arch)
 
-# Make sure we get the right libpq
-export PATH=/usr/pgsql-15/bin:$PATH
+# Make sure we get the latest libpq
+export PATH=$(ls -d /usr/pgsql-1* | sort -r | head -1)/bin:$PATH
 
 # Stop creating pyc files.
 export PYTHONDONTWRITEBYTECODE=1
@@ -68,7 +68,7 @@ Summary:	The core server package for pgAdmin.
 License:	PostgreSQL
 URL:		https://www.pgadmin.org/
 
-Requires:	python3, postgresql-libs >= 11, krb5-libs
+Requires:	python3, libpq5 >= 11, krb5-libs
 
 %description
 The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -230,7 +230,7 @@ if [ "${OS_VERSION}" == 7 ]; then
 fi
 
 # Get the libpq we need
-yumdownloader -y --downloadonly --destdir="${DISTROOT}" postgresql15-libs
+yumdownloader -y --downloadonly --destdir="${DISTROOT}" libpq5 libpq5-devel
 
 #
 # Get the results!