From a3a2f16c54b67b253feacf85faf15ba33864fece Mon Sep 17 00:00:00 2001
From: Evgeniy Patlan <evgeniy.patlan@percona.com>
Date: Mon, 18 Dec 2023 16:15:14 +0200
Subject: [PATCH] ENG-7 fix build

---
 config/deb/rules                | 2 +-
 config/rpm/percona-toolkit.spec | 3 ++-
 config/scripts/pt_builder.sh    | 8 +-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/config/deb/rules b/config/deb/rules
index f342701f..a055414a 100755
--- a/config/deb/rules
+++ b/config/deb/rules
@@ -5,7 +5,7 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 	perl Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
+	VERSION=3.5.6 $(MAKE)
 	touch build-stamp
 
 clean:
diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec
index 1291711c..05e9764b 100644
--- a/config/rpm/percona-toolkit.spec
+++ b/config/rpm/percona-toolkit.spec
@@ -40,11 +40,12 @@ visit http://www.percona.com/software/.
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 #sed -i '499d' Makefile
-make %{?_smp_mflags}
+VERSION=3.5.6 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+for file in $(diff -rq bin/ $RPM_BUILD_ROOT/usr/bin | awk '{print $NF}'); do cp bin/$file $RPM_BUILD_ROOT/usr/bin; done
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 find $RPM_BUILD_ROOT -type f -name 'percona-toolkit.pod' -exec rm -f {} ';'
diff --git a/config/scripts/pt_builder.sh b/config/scripts/pt_builder.sh
index 42807801..a6115ce2 100644
--- a/config/scripts/pt_builder.sh
+++ b/config/scripts/pt_builder.sh
@@ -160,7 +160,7 @@ install_go() {
     rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9
     mv go1.9 /usr/local/
     ln -s /usr/local/go1.9 /usr/local/go
-    GO_VERSION=1.21.1
+    GO_VERSION=1.21.5
     wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -O /tmp/golang.tar.gz
     tar -C /usr/local -xzf /tmp/golang.tar.gz
     update-alternatives --install "/usr/bin/go" "go" "/usr/local/go/bin/go" 0
@@ -370,12 +370,6 @@ build_rpm(){
     rm -fr rpmbuild
     mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS}
     cp $SRC_RPM rpmbuild/SRPMS/
-
-    cd rpmbuild/SPECS
-    echo '%undefine _missing_build_ids_terminate_build' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec
-    echo '%define debug_package %{nil}' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec
-    sed -i "s/@@ARHITECTURE@@/x86_64/" percona-toolkit.spec
-    #
     cd $WORKDIR
     RHEL=$(rpm --eval %rhel)
     ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')