Release PXB-8.0.35-34

XB_VERSION

@@ -1,4 +1,4 @@
 XB_VERSION_MAJOR=8
 XB_VERSION_MINOR=0
 XB_VERSION_PATCH=35
-XB_VERSION_EXTRA=-33
+XB_VERSION_EXTRA=-34

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,13 +52,17 @@ 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.
 
 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.

storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh

@@ -246,25 +246,30 @@ install_deps() {
         yum -y install git wget yum-utils curl
         yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm
         if [ x"$ARCH" = "xx86_64" ]; then
-            if [ $RHEL = 9 ]; then
-                yum-config-manager --enable ol9_distro_builder
-                yum-config-manager --enable ol9_codeready_builder
-                yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+            if [ ${RHEL} = 9 -o ${RHEL} = 10 ]; then
+                yum-config-manager --enable ol${RHEL}_distro_builder
+                yum-config-manager --enable ol${RHEL}_codeready_builder
+                yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-${RHEL}.noarch.rpm
             else
                 add_percona_yum_repo
                 percona-release enable tools testing
             fi
         else
             yum-config-manager --enable ol"${RHEL}"_codeready_builder
-            yum -y install epel-release
+            if [ ${RHEL} = 10 ]; then
+                yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
+                yum -y install epel-release
+            else
+                yum -y install epel-release
+            fi
         fi
 
-        if [ ${RHEL} = 8 -o ${RHEL} = 9 ]; then
+        if [ ${RHEL} = 8 -o ${RHEL} = 9 -o ${RHEL} = 10 ]; then
             PKGLIST+=" binutils-devel python3-pip python3-setuptools"
             PKGLIST+=" libcurl-devel cmake libaio-devel zlib-devel libev-devel bison make gcc"
             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 ]; then
+            if [ ${RHEL} = 9 -o ${RHEL} = 10 ]; then
                 PKGLIST+=" rsync procps-ng-devel python3-sphinx"
             else
                 if [ x"$ARCH" = "xx86_64" ]; then

storage/innobase/xtrabackup/utils/percona-xtrabackup.spec

@@ -120,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1/z*
 
 %post
 cp %SOURCE999 /tmp/ 2>/dev/null ||
-bash /tmp/call-home.sh -f "PRODUCT_FAMILY_PXB" -v %{xb_version_major}.%{xb_version_minor}.%{xb_version_patch}-%{xb_version_extra}-%{rpm_release} -d "PACKAGE" &>/dev/null || :
+bash /tmp/call-home.sh -f "PRODUCT_FAMILY_PXB" -v %{xb_version_major}.%{xb_version_minor}.%{xb_version_patch}%{xb_version_extra}-%{rpm_release} -d "PACKAGE" &>/dev/null || :
 rm -f /tmp/call-home.sh
 
 %clean