- change default to mysqldump, mysqlhotcopy no longer exists in mysql 5.7

- rel 2

diff --git a/bacula-backup-mysql.spec b/bacula-backup-mysql.spec
index 44acbd45ff79706520ba941ec85e88cfcfd57f36..02f7be35a09c5ae0e4481a6e4fcb4f8db82e774a 100644 (file)
--- a/bacula-backup-mysql.spec
+++ b/bacula-backup-mysql.spec
@@ -2,15 +2,15 @@
 Summary:       MySQL backup hook for Bacula
 Name:          bacula-backup-mysql
 Version:       0.8
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Databases
 Source0:       https://github.com/glensc/bacula-backup-mysql/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: e9bf019ba75f2d7db5ec215eb7668632
+Patch0:                default-mysqldump.patch
 URL:           https://github.com/glensc/bacula-backup-mysql
 BuildRequires: perl-tools-pod
 BuildRequires: rpm-perlprov >= 4.1-13
-Requires:      /usr/bin/mysqlhotcopy
 Requires:      bacula-common
 Requires:      perl-DBD-mysql
 BuildArch:     noarch
@@ -26,6 +26,7 @@ This package contains MySQL backup hook.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 pod2man README.pod -o bacula-backup-mysql.1

diff --git a/default-mysqldump.patch b/default-mysqldump.patch
new file mode 100644 (file)
index 0000000..e0dcd62
--- /dev/null
+++ b/default-mysqldump.patch
@@ -0,0 +1,22 @@
+--- bacula-backup-mysql-0.8/README.pod~        2016-05-30 11:25:11.000000000 +0200
++++ bacula-backup-mysql-0.8/README.pod 2018-04-08 08:26:43.742397366 +0200
+@@ -42,7 +42,7 @@
+ backup; any C<exclude_database> options will reduce this list.
+ 
+ Since v0.6 it's possible to do SQL dump backups with L<mysqldump(1)>. Use this if you want to backup InnoDB databases.
+-Option name is C<dump_type>, which takes values C<mysqlhotcopy> (default) and C<mysqldump>.
++Option name is C<dump_type>, which takes values C<mysqlhotcopy> and C<mysqldump> (default).
+ 
+ Since v0.7 you can pass arbitary options to C<mysqlhotcopy> or C<mysqldump>
+ using C<mysqlhotcopy_options> or C<mysqldump_options> respectively. Use this to
+--- bacula-backup-mysql-0.8/bacula-backup-mysql.pl~    2016-05-30 11:25:11.000000000 +0200
++++ bacula-backup-mysql-0.8/bacula-backup-mysql.pl     2018-04-08 08:25:54.428793262 +0200
+@@ -252,7 +252,7 @@
+       my $socket = $c->get($cluster, 'socket') || $c->get('client', 'socket');
+ 
+       # dump type: mysqlhotcopy, mysqldump
+-      my $dump_type = $c->get($cluster, 'dump_type') || 'mysqlhotcopy';
++      my $dump_type = $c->get($cluster, 'dump_type') || 'mysqldump';
+ 
+       my $dbh = BBM::DB->new($user, $password, $host, $socket);
+