pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/5679/head
Dave Page 2022-12-22 11:21:21 +00:00 committed by GitHub
parent 628b37dc4d
commit 94d6b85d72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/debian/build.sh
View File

@ -122,7 +122,7 @@ fakeroot dpkg-deb --build "${METAROOT}" "${DISTROOT}/${APP_NAME}_${APP_LONG_VERS
# Get the libpq package # Get the libpq package
pushd "${DISTROOT}" 1> /dev/null pushd "${DISTROOT}" 1> /dev/null
apt-get download libpq5 apt-get download libpq5 libpq-dev
popd 1> /dev/null popd 1> /dev/null
echo "Completed. DEBs created in ${DISTROOT}." echo "Completed. DEBs created in ${DISTROOT}."

8
pkg/redhat/build.sh
View File

@ -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_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g')
OS_ARCH=$(arch) OS_ARCH=$(arch)
# Make sure we get the right libpq # Make sure we get the latest libpq
export PATH=/usr/pgsql-15/bin:$PATH export PATH=$(ls -d /usr/pgsql-1* | sort -r | head -1)/bin:$PATH
# Stop creating pyc files. # Stop creating pyc files.
export PYTHONDONTWRITEBYTECODE=1 export PYTHONDONTWRITEBYTECODE=1
@ -68,7 +68,7 @@ Summary: The core server package for pgAdmin.
License: PostgreSQL License: PostgreSQL
URL: https://www.pgadmin.org/ URL: https://www.pgadmin.org/
Requires: python3, postgresql-libs >= 11, krb5-libs Requires: python3, libpq5 >= 11, krb5-libs
%description %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. 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 fi
# Get the libpq we need # Get the libpq we need
yumdownloader -y --downloadonly --destdir="${DISTROOT}" postgresql15-libs yumdownloader -y --downloadonly --destdir="${DISTROOT}" libpq5 libpq5-devel
# #
# Get the results! # Get the results!