From a896be9f4d0dc1cef2e1fe539351acadfe24c81c Mon Sep 17 00:00:00 2001
From: EvgeniyPatlan <evgeniy.patlan@percona.com>
Date: Mon, 27 Feb 2023 12:04:28 +0100
Subject: [PATCH] DISTPG-530 Update build flow

---
 .../scripts/pg_stat_monitor_builder.sh            | 15 +++------------
 rpm/pg-stat-monitor.spec                          |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh
index 0837d5c..2957a82 100644
--- a/percona-packaging/scripts/pg_stat_monitor_builder.sh
+++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh
@@ -84,14 +84,6 @@ check_workdir(){
     return
 }
 
-add_percona_yum_repo(){
-    if [ ! -f /etc/yum.repos.d/percona-dev.repo ]; then
-        curl -o /etc/yum.repos.d/percona-dev.repo https://jenkins.percona.com/yum-repo/percona-dev.repo
-        sed -i 's:$basearch:x86_64:g' /etc/yum.repos.d/percona-dev.repo
-    fi
-    return
-}
-
 set_changelog(){
     if [ -z $1 ]
     then
@@ -209,19 +201,18 @@ install_deps() {
     if [ "$OS" == "rpm" ]
     then
         yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm
-        add_percona_yum_repo
         if [[ ${PG_RELEASE} == "11" ]]; then
             percona-release enable ppg-11 release
         elif [[ $PG_RELEASE == "12" ]]; then
             percona-release enable ppg-12 release
         fi
         yum -y install git wget
-        PKGLIST="percona-postgresql-common percona-postgresql${PG_RELEASE}-devel"
+        PKGLIST="percona-postgresql${PG_RELEASE}-devel"
         PKGLIST+=" clang-devel git clang llvm-devel rpmdevtools vim wget"
         PKGLIST+=" perl binutils gcc gcc-c++"
         PKGLIST+=" clang-devel llvm-devel git rpm-build rpmdevtools wget gcc make autoconf"
-        if [[ "${RHEL}" -eq 8 ]]; then 
-            dnf -y module disable postgresql
+        if [[ "${RHEL}" -ge 8 ]]; then 
+            dnf -y module disable postgresql || true
         elif [[ "${RHEL}" -eq 7 ]]; then
             PKGLIST+=" llvm-toolset-7-clang llvm-toolset-7-llvm-devel llvm5.0-devel"
             until yum -y install epel-release centos-release-scl; do
diff --git a/rpm/pg-stat-monitor.spec b/rpm/pg-stat-monitor.spec
index 4c5ea17..f84cbeb 100644
--- a/rpm/pg-stat-monitor.spec
+++ b/rpm/pg-stat-monitor.spec
@@ -12,7 +12,7 @@ Source0:        percona-pg-stat-monitor%{pgrel}-%{version}.tar.gz
 URL:            https://github.com/Percona-Lab/pg_stat_monitor
 BuildRequires:  percona-postgresql%{pgrel}-devel
 Requires:       postgresql-server
-Provides:	percona-pg-stat-monitor%{pgrel}
+Provides:	    percona-pg-stat-monitor%{pgrel}
 Conflicts:      percona-pg-stat-monitor%{pgrel}
 Obsoletes:      percona-pg-stat-monitor%{pgrel}
 Epoch:          1