From 8ec09126ce6b32b8705a6a03d8c93bec460c172ea4a2ef324a94803c2d6c724b Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sun, 11 Nov 2012 13:27:26 +0000 Subject: [PATCH] Accepting request 140846 from home:AndreasStieger:branches:server:database - fix SLE 11 build by adding alternative perl macros OBS-URL: https://build.opensuse.org/request/show/140846 OBS-URL: https://build.opensuse.org/package/show/server:database/percona-toolkit?expand=0&rev=6 --- percona-toolkit-2.1.5.tar.gz | 3 --- percona-toolkit.changes | 5 +++++ percona-toolkit.spec | 8 ++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 percona-toolkit-2.1.5.tar.gz diff --git a/percona-toolkit-2.1.5.tar.gz b/percona-toolkit-2.1.5.tar.gz deleted file mode 100644 index 63225c2..0000000 --- a/percona-toolkit-2.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e080f51233ea4faaed2f2b1fad8b2dc76104f99ef614b14807c4960e9c169e26 -size 1450039 diff --git a/percona-toolkit.changes b/percona-toolkit.changes index af7f6a2..436fb78 100644 --- a/percona-toolkit.changes +++ b/percona-toolkit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 11 13:16:38 UTC 2012 - andreas.stieger@gmx.de + +- fix SLE 11 build by adding alternative perl macros + ------------------------------------------------------------------- Tue Oct 16 20:34:53 UTC 2012 - andreas.stieger@gmx.de diff --git a/percona-toolkit.spec b/percona-toolkit.spec index bde68b8..febf8ff 100644 --- a/percona-toolkit.spec +++ b/percona-toolkit.spec @@ -25,7 +25,11 @@ Release: 0 Url: https://www.percona.com/software/percona-toolkit/ Source: https://www.percona.com/redir/downloads/%{name}/%{version}/percona-toolkit-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else %{perl_requires} +%endif Requires: perl(DBD::mysql) >= 1.0 Requires: perl(DBI) >= 1.13 Requires: perl(IO::Socket::SSL) @@ -59,6 +63,10 @@ make %{?_smp_mflags} %install %perl_make_install %perl_process_packlist +%if 0%{?suse_version} < 1130 +%__rm -rf $RPM_BUILD_ROOT%perl_vendorarch/auto/%{name} +%__rm -rf $RPM_BUILD_ROOT/var/adm/perl-modules/%{name} +%endif %clean rm -rf $RPM_BUILD_ROOT