From b878eb7f78eba20cb634e4ec1722d1be375c0331 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Wed, 6 Aug 2025 16:10:48 +0300
Subject: [PATCH] PKG-1032 Packaging tasks for release - PXB 8.0.35-34

---
 storage/innobase/xtrabackup/utils/debian/control  | 15 ++++++++++++++-
 .../utils/percona-xtrabackup-8.0_builder.sh       |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/storage/innobase/xtrabackup/utils/debian/control b/storage/innobase/xtrabackup/utils/debian/control
index 3e4ade207ccc..c60d782738eb 100644
--- a/storage/innobase/xtrabackup/utils/debian/control
+++ b/storage/innobase/xtrabackup/utils/debian/control
@@ -29,7 +29,16 @@ Package: percona-xtrabackup-80
 Architecture: any
 Depends: libdbd-mysql-perl, libcurl4-openssl-dev, rsync, zstd, lz4, ${misc:Depends}, ${shlibs:Depends}
 Provides: xtrabackup
-Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24
+Conflicts: percona-xtrabackup-21,
+           percona-xtrabackup-22,
+           percona-xtrabackup,
+           percona-xtrabackup-24
+           percona-xtrabackup-81,
+           percona-xtrabackup-82,
+           percona-xtrabackup-83,
+           percona-xtrabackup-84,
+           percona-xtrabackup-pro-80,
+           percona-xtrabackup-pro-84
 Breaks: xtrabackup (<< 2.0.0~)
 Replaces: xtrabackup (<< 2.0.0~)
 Enhances: mysql-server
@@ -43,6 +52,8 @@ Package: percona-xtrabackup-dbg-80
 Section: debug
 Architecture: any
 Depends: percona-xtrabackup-80 (= ${binary:Version}), ${misc:Depends}
+Conflicts: percona-xtrabackup-pro-dbg-80,
+           percona-xtrabackup-pro-dbg-84
 Description: Debug symbols for Percona XtraBackup
  Debug symbols for the binaries in percona-xtrabackup. Install this
  package if you need to run any of those with gdb.
@@ -50,6 +61,8 @@ Description: Debug symbols for Percona XtraBackup
 Package: percona-xtrabackup-test-80
 Architecture: any
 Depends: mysql-client, percona-xtrabackup-80, ${misc:Depends}
+Conflicts: percona-xtrabackup-test-pro-80,
+           percona-xtrabackup-test-pro-84
 Description: Test suite for Percona XtraBackup
  Test suite for Percona XtraBackup. Install this package if you intend
  to run XtraBackup's test suite.
diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh
index 37b53a246aec..f16ae613c8cc 100644
--- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh
+++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh
@@ -270,7 +270,7 @@ install_deps() {
             PKGLIST+=" rpm-build libgcrypt-devel ncurses-devel readline-devel openssl-devel gcc-c++"
             PKGLIST+=" vim-common rpmlint patchelf python3-wheel libudev-devel"
             if [ ${RHEL} = 9 -o ${RHEL} = 10 ]; then
-                PKGLIST+=" rsync procps-ng-devel python3-sphinx"
+                PKGLIST+=" rsync procps-ng-devel python3-sphinx libquadmath-devel"
             else
                 if [ x"$ARCH" = "xx86_64" ]; then
                     yum-config-manager --enable powertools