DISTPG-349 modify build script

percona-packaging/scripts/pg_stat_monitor_builder.sh

@@ -21,6 +21,7 @@ Usage: $0 [OPTIONS]
         --rpm_release       RPM version( default = 1)
         --deb_release       DEB version( default = 1)
         --pg_release        PPG version build on( default = 11)
+        --pg_version        product version community or percona ( default = percona )
         --version           product version
         --help) usage ;;
 Example $0 --builddir=/tmp/test --get_sources=1 --build_src_rpm=1 --build_rpm=1
@@ -57,6 +58,7 @@ append_arg_to_args () {
             --rpm_release=*) RPM_RELEASE="$val" ;;
             --deb_release=*) DEB_RELEASE="$val" ;;
             --pg_release=*) PG_RELEASE="$val" ;;
+            --pg_version=*) PG_VERSION="$val" ;;
             --version=*) VERSION="$val" ;;
             --help) usage ;;
             *)
@@ -110,6 +112,7 @@ get_sources(){
     echo "BUILD_ID=${BUILD_ID}" >> pg-stat-monitor.properties
     echo "BRANCH_NAME=$(echo ${BRANCH} | awk -F '/' '{print $(NF)}')" >> pg-stat-monitor.properties
     echo "PG_RELEASE=${PG_RELEASE}" >> pg-stat-monitor.properties
+    echo "PG_VERSION=${PG_VERSION}" >> pg-stat-monitor.properties
     echo "RPM_RELEASE=${RPM_RELEASE}" >> pg-stat-monitor.properties
     echo "DEB_RELEASE=${DEB_RELEASE}" >> pg-stat-monitor.properties
     git clone "$REPO" ${PRODUCT_FULL}
@@ -190,9 +193,10 @@ install_deps() {
             percona-release enable ppg-12 release
         fi
         yum -y install git wget
+        PKGLIST="percona-postgresql-common percona-postgresql${PG_RELEASE}-devel"
         PKGLIST+=" clang-devel git clang llvm-devel rpmdevtools vim wget"
         PKGLIST+=" perl binutils gcc gcc-c++"
-        PKGLIST+=" percona-postgresql-common clang-devel llvm-devel percona-postgresql${PG_RELEASE}-devel git rpm-build rpmdevtools wget gcc make autoconf"
+        PKGLIST+=" clang-devel llvm-devel git rpm-build rpmdevtools wget gcc make autoconf"
         if [[ "${RHEL}" -eq 8 ]]; then 
             dnf -y module disable postgresql
         elif [[ "${RHEL}" -eq 7 ]]; then
@@ -223,8 +227,15 @@ install_deps() {
             percona-release enable ppg-12 release
         fi
 
+
+        PKGLIST="percona-postgresql-${PG_RELEASE} percona-postgresql-common percona-postgresql-server-dev-all"
+
+        if [[ "${PG_VERSION}" == "community" ]]; then
+            # ---- using a community version of postgresql
             wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
             echo "deb http://apt.postgresql.org/pub/repos/apt/ ${PG_RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
+            PKGLIST="postgresql-${PG_RELEASE} postgresql-common postgresql-server-dev-all"
+        fi
 
         apt-get update
 
@@ -238,8 +249,9 @@ install_deps() {
             fi
         fi
 
-        PKGLIST+=" postgresql-${PG_RELEASE} debconf debhelper clang-7 devscripts dh-exec dh-systemd git wget libkrb5-dev libssl-dev postgresql-common postgresql-server-dev-all"
+        PKGLIST+=" debconf debhelper clang-7 devscripts dh-exec dh-systemd git wget libkrb5-dev libssl-dev"
-        PKGLIST+=" build-essential debconf debhelper devscripts dh-exec dh-systemd git wget libxml-checker-perl libxml-libxml-perl libio-socket-ssl-perl libperl-dev libssl-dev libxml2-dev txt2man zlib1g-dev libpq-dev"
+        PKGLIST+=" build-essential debconf debhelper devscripts dh-exec dh-systemd git wget libxml-checker-perl"
+        PKGLIST+=" libxml-libxml-perl libio-socket-ssl-perl libperl-dev libssl-dev libxml2-dev txt2man zlib1g-dev libpq-dev"
 
         until DEBIAN_FRONTEND=noninteractive apt-get -y install ${PKGLIST}; do
             sleep 1

rpm/pg-stat-monitor.spec

@@ -10,7 +10,7 @@ Release:        %{rpm_release}%{?dist}
 License:        PostgreSQL
 Source0:        percona-pg-stat-monitor%{pgrel}-%{version}.tar.gz
 URL:            https://github.com/Percona-Lab/pg_stat_monitor
-BuildRequires:  percona-postgresql%{pgrel}-devel
+BuildRequires:  postgresql%{pgrel}-devel or percona-postgresql%{pgrel}-devel
 Requires:       postgresql-server
 Provides:	percona-pg-stat-monitor%{pgrel}
 Epoch:          1