Add patch to use explicit shebangs, fixes FTBFS for Fedora 30
Apply proper buildflags Modernize spec-file
This commit is contained in:
Björn Esser
parent
0fbd546a9f
commit
fafa8c9a5e
|
|
@ -0,0 +1,135 @@
|
|||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/dbug/tests-t.pl
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/dbug/tests-t.pl
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/dbug/tests-t.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
#
|
||||
# A driver program to test DBUG features - runs tests (shell commands)
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/libevent/event_rpcgen.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/libevent/event_rpcgen.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/libevent/event_rpcgen.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
#
|
||||
# Copyright (c) 2005 Niels Provos <provos@citi.umich.edu>
|
||||
# All rights reserved.
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/breakdancer.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
|
||||
import itertools
|
||||
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/plugin/innodb_memcached/daemon_memcached/testsuite/breakdancer/engine_test.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
|
||||
import breakdancer
|
||||
from breakdancer import Condition, Effect, Action, Driver
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/analyzing_table_statistics.rst
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/analyzing_table_statistics.rst
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/doc/source/xtrabackup_bin/analyzing_table_statistics.rst
|
||||
@@ -48,7 +48,7 @@ The following script can be used to summ
|
||||
|
||||
tabulate-xtrabackup-stats.pl
|
||||
|
||||
- #!/usr/bin/env perl
|
||||
+ #!/usr/bin/perl
|
||||
use strict;
|
||||
use warnings FATAL => 'all';
|
||||
my $script_version = "0.1";
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-script.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/subunit/tests/sample-script.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-script.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
import sys
|
||||
if sys.platform == "win32":
|
||||
import msvcrt, os
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-two-script.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/subunit/tests/sample-two-script.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/tests/sample-two-script.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
import sys
|
||||
print "test old mcdonald"
|
||||
print "success old mcdonald"
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/subunit2junitxml
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/subunit2junitxml
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/subunit2junitxml
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
# subunit: extensions to python unittest to get test results from subprocesses.
|
||||
# Copyright (C) 2009 Robert Collins <robertc@robertcollins.net>
|
||||
#
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/mysql-test/suite/opt_trace/validate_json.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/mysql-test/suite/opt_trace/validate_json.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/mysql-test/suite/opt_trace/validate_json.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/python
|
||||
+#! /usr/bin/python2
|
||||
|
||||
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
#
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/run.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/subunit/run.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/subunit/run.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
+#!/usr/bin/python2
|
||||
#
|
||||
# Simple subunit testrunner for python
|
||||
# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
|
||||
Index: percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/testtools/tests/test_compat.py
|
||||
===================================================================
|
||||
--- percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.orig/storage/innobase/xtrabackup/test/python/testtools/tests/test_compat.py
|
||||
+++ percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e/storage/innobase/xtrabackup/test/python/testtools/tests/test_compat.py
|
||||
@@ -43,15 +43,15 @@ class TestDetectEncoding(testtools.TestC
|
||||
"""
|
||||
# With interpreter binary and using Emacs style file encoding comment:
|
||||
self._check_encoding("latin-1", (
|
||||
- "#!/usr/bin/python\n",
|
||||
+ "#!/usr/bin/python2\n",
|
||||
"# -*- coding: latin-1 -*-\n",
|
||||
"import os, sys\n"))
|
||||
self._check_encoding("iso-8859-15", (
|
||||
- "#!/usr/bin/python\n",
|
||||
+ "#!/usr/bin/python2\n",
|
||||
"# -*- coding: iso-8859-15 -*-\n",
|
||||
"import os, sys\n"))
|
||||
self._check_encoding("ascii", (
|
||||
- "#!/usr/bin/python\n",
|
||||
+ "#!/usr/bin/python2\n",
|
||||
"# -*- coding: ascii -*-\n",
|
||||
"import os, sys\n"))
|
||||
# Without interpreter line, using plain text:
|
||||
@@ -112,7 +112,7 @@ class TestDetectEncoding(testtools.TestC
|
||||
"# Or is it coding: iso-8859-2\n"),
|
||||
possibly_invalid=True)
|
||||
self._check_encoding("iso-8859-1", (
|
||||
- "#!/usr/bin/python\n",
|
||||
+ "#!/usr/bin/python2\n",
|
||||
"# Is the coding: iso-8859-1\n",
|
||||
"# Or is it coding: iso-8859-2\n"))
|
||||
self._check_encoding("iso-8859-1", (
|
||||
|
|
@ -12,11 +12,12 @@
|
|||
Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB
|
||||
Name: percona-xtrabackup
|
||||
Version: 2.3.6
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
License: GPLv2
|
||||
URL: http://www.percona.com/software/percona-xtrabackup/
|
||||
Source: https://github.com/percona/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
|
||||
Patch0: percona-xtrabackup-gcc7-flags.patch
|
||||
Patch1: percona-xtrabackup-2.3.6-explicit-shebangs.patch
|
||||
Provides: xtrabackup >= 2.0.0
|
||||
Provides: %{name}-%{pxbu_major_minor}
|
||||
Obsoletes: xtrabackup < 2.0.0
|
||||
|
|
@ -46,7 +47,6 @@ Online backup for InnoDB/XtraDB in MySQL, MariaDB and Percona Server.
|
|||
|
||||
%package test
|
||||
Summary: Test suite for Percona Xtrabackup
|
||||
Group: Applications/Databases
|
||||
Provides: %{name}-test-%{pxbu_major_minor}
|
||||
Requires: %{name}
|
||||
Requires: /usr/bin/mysql
|
||||
|
|
@ -58,6 +58,7 @@ This package contains the test suite for Percona Xtrabackup
|
|||
%prep
|
||||
%setup -qn %{name}-%{commit}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# fails build
|
||||
# build for mariadb version
|
||||
|
|
@ -79,10 +80,9 @@ sed -i "s/AC_PROG_LIBTOOL/LT_INIT/g" storage/innobase/xtrabackup/src/libarchive/
|
|||
sed -i "s/-Werror//g" storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt
|
||||
|
||||
%build
|
||||
cmake -DBUILD_CONFIG=xtrabackup_release && make -j4
|
||||
%cmake -DBUILD_CONFIG=xtrabackup_release && %make_build
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
|
||||
install -d %{buildroot}%{_bindir}
|
||||
install -d %{buildroot}%{_datadir}
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
|
|
@ -117,7 +117,8 @@ popd
|
|||
%{_bindir}/xtrabackup
|
||||
%{_bindir}/xbstream
|
||||
%{_bindir}/xbcrypt
|
||||
%doc COPYING README VERSION
|
||||
%doc README VERSION
|
||||
%license COPYING
|
||||
%{_mandir}/man1/innobackupex.1.gz
|
||||
%{_mandir}/man1/xtrabackup.1.gz
|
||||
%{_mandir}/man1/xbstream.1.gz
|
||||
|
|
@ -127,9 +128,14 @@ popd
|
|||
# https://bugs.launchpad.net/percona-xtrabackup/+bug/1222777
|
||||
%files -n percona-xtrabackup-test
|
||||
%{_datadir}/percona-xtrabackup-test
|
||||
%doc COPYING
|
||||
%license COPYING
|
||||
|
||||
%changelog
|
||||
* Fri Jan 04 2019 Björn Esser <besser82@fedoraproject.org> - 2.3.6-11
|
||||
- Add patch to use explicit shebangs, fixes FTBFS for Fedora 30
|
||||
- Apply proper buildflags
|
||||
- Modernize spec-file
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue