From c78904501d3b78359d9cf09d5d2cd82848d55a57 Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Mon, 27 Mar 2023 18:08:02 +0530
Subject: [PATCH] 1) Correct the name of the python binary to use with
 mod_wsgi. 2) Remove logic for Ubuntu 18 as we remove the support for it.

---
 pkg/debian/setup.sh          | 11 ++---------
 pkg/linux/build-functions.sh |  6 ++----
 pkg/redhat/build.sh          |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkg/debian/setup.sh b/pkg/debian/setup.sh
index 0c04f2369..f35ff30e3 100755
--- a/pkg/debian/setup.sh
+++ b/pkg/debian/setup.sh
@@ -33,12 +33,5 @@ apt update
 
 # Install pre-reqs
 echo "Installing build pre-requisites..."
-# Install correct Python packages for Ubuntu 18.
-OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g' | awk -F "." '{ print $1 }')
-if [ "${OS_VERSION}" == "18" ]; then
-  apt install -y build-essential python3.8-dev python3.8-venv libpq-dev libffi-dev nodejs yarn libkrb5-dev
-  python3.8 -m pip install pip wheel sphinx sphinxcontrib-youtube
-else
-  apt install -y build-essential python3-dev python3-venv python3-sphinx python3-wheel python3-pip libpq-dev libffi-dev nodejs yarn libkrb5-dev
-  python3 -m pip install sphinxcontrib-youtube
-fi
+apt install -y build-essential python3-dev python3-venv python3-sphinx python3-wheel python3-pip libpq-dev libffi-dev nodejs yarn libkrb5-dev
+python3 -m pip install sphinxcontrib-youtube
diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh
index b7083908f..d73920371 100644
--- a/pkg/linux/build-functions.sh
+++ b/pkg/linux/build-functions.sh
@@ -24,13 +24,11 @@ _setup_env() {
     OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g' | awk -F "." '{ print $1 }')
     SYSTEM_PYTHON_PATH='/usr/bin/python3'
     PYTHON_BINARY='python3'
-    if [ "$2" == 'debian' ] && [ "${OS_VERSION}" == "18" ]; then
-      SYSTEM_PYTHON_PATH='/usr/bin/python3.8'
-      PYTHON_BINARY='python3.8'
-    elif [ "$2" == 'redhat' ] && [ "${OS_VERSION}" == "8" ]; then
+    if [ "$2" == 'redhat' ] && [ "${OS_VERSION}" == "8" ]; then
       SYSTEM_PYTHON_PATH='/usr/bin/python3.9'
       PYTHON_BINARY='python3.9'
     fi
+    PYTHON_BINARY_WITHOUT_DOTS=$(echo ${PYTHON_BINARY} | sed -e 's/\.//g')
 }
 
 _cleanup() {
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index a0f416a1c..cadad4f3b 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -149,7 +149,7 @@ BuildArch:	noarch
 Summary:	The web interface for pgAdmin, hosted under Apache HTTPD.
 License:	PostgreSQL
 URL:		https://www.pgadmin.org/
-Requires:	${APP_NAME}-server = ${RPM_VERSION}, httpd, ${PYTHON_BINARY}-mod_wsgi
+Requires:	${APP_NAME}-server = ${RPM_VERSION}, httpd, ${PYTHON_BINARY_WITHOUT_DOTS}-mod_wsgi
 
 %description
 The web interface for pgAdmin, hosted under Apache HTTPD. 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.