>From 4f76f7c8930853c588fe75b2f877f1c847beea48 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 16 Oct 2019 14:14:17 +0300 Subject: [PATCH] 2.4.12-alt4 - E2K: avoid lcc-unsupported option - Minor spec cleanup --- .gear/percona-xtrabackup.spec | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/.gear/percona-xtrabackup.spec b/.gear/percona-xtrabackup.spec index 34f5c89..741954f 100644 --- a/.gear/percona-xtrabackup.spec +++ b/.gear/percona-xtrabackup.spec @@ -6,17 +6,18 @@ %add_findreq_skiplist %_datadir/xtrabackup-test/*.pl %add_verify_elf_skiplist %_datadir/xtrabackup-test/lib/My/SafeProcess/my_safe_process -Summary: XtraBackup online backup for MySQL / InnoDB Name: percona-xtrabackup Version: 2.4.12 -Release: alt3 -Group: Databases +Release: alt4 + +Summary: XtraBackup online backup for MySQL / InnoDB License: GPLv2 -Packager: Evgenii Terechkov -Url: https://github.com/percona/percona-xtrabackup.git +Group: Databases -Source: %name-%version.tar +Url: https://github.com/percona/percona-xtrabackup.git +Source0: %name-%version.tar Source1: boost.tar +Packager: Evgenii Terechkov BuildRequires: libaio-devel libgcrypt-devel gcc-c++ cmake bzr bison libtool libncurses-devel zlib-devel python-module-sphinx perl-podlators libev-devel libssl-devel libcurl-devel xxd texlive-latex-base texlive-latex-recommended latexmk liblz4-devel @@ -25,7 +26,8 @@ BuildRequires: /proc Requires: perl-podlators rsync %description -Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines. +Percona XtraBackup is OpenSource online (non-blockable) backup solution +for InnoDB and XtraDB engines. %package tests Summary: XtraBackup online backup for MySQL / InnoDB (testsuite) @@ -33,12 +35,17 @@ License: GPLv2 Group: Databases %description tests -Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines. +Percona XtraBackup is OpenSource online (non-blockable) backup solution +for InnoDB and XtraDB engines. This subpackage contains testsuite. %prep %setup -a1 +%ifarch %e2k +# lcc 1.23.20 doesn't do that (mcst#2999) +sed -i 's,-fabi-version=2,,' cmake/build_configurations/compiler_options.cmake +%endif %build cmake \ @@ -63,11 +70,8 @@ popd %install mkdir -p %buildroot%_bindir %buildroot%_datadir %buildroot%_man1dir %makeinstall_std - -install -m 644 storage/innobase/xtrabackup/doc/source/build/man/xtrabackup.1 %buildroot%_man1dir -install -m 644 storage/innobase/xtrabackup/doc/source/build/man/xbcrypt.1 %buildroot%_man1dir -install -m 644 storage/innobase/xtrabackup/doc/source/build/man/xbstream.1 %buildroot%_man1dir -install -m 644 storage/innobase/xtrabackup/doc/source/build/man/innobackupex.1 %buildroot%_man1dir +install -pm 644 storage/innobase/xtrabackup/doc/source/build/man/*.1 \ + %buildroot%_man1dir %files %_bindir/innobackupex @@ -78,12 +82,16 @@ install -m 644 storage/innobase/xtrabackup/doc/source/build/man/innobackupex.1 % %_bindir/xbcloud_osenv %_man1dir/*.1.* %doc storage/innobase/xtrabackup/contrib/backup_mysql_cron.sh -%doc storage/innobase/xtrabackup/doc/source/build/latex/PerconaXtraBackup-2.4.pdf +%doc storage/innobase/xtrabackup/doc/source/build/latex/PerconaXtraBackup-*.pdf %files tests %_datadir/xtrabackup-test %changelog +* Wed Oct 16 2019 Michael Shigorin 2.4.12-alt4 +- E2K: avoid lcc-unsupported option +- Minor spec cleanup + * Tue Mar 26 2019 Terechkov Evgenii 2.4.12-alt3 - Build with system-wide liblz4 (ALT#36403) -- 2.10.4