[packages/mysql-zrm] tar (1.27.1) -s and -c conflict

[glen]

commit 60c18e5b3e0eadf6b8901bc88667d683e0a3afc8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 1 19:30:55 2014 +0300

    tar (1.27.1) -s and -c conflict

 mysql-zrm.spec    |  5 ++++-
 tar-options.patch | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/mysql-zrm.spec b/mysql-zrm.spec
index 9859ebe..7cf04ad 100644
--- a/mysql-zrm.spec
+++ b/mysql-zrm.spec
@@ -4,11 +4,12 @@
 Summary:	Zmanda MySQL Backup and Recovery Manager for MySQL
 Name:		mysql-zrm
 Version:	3.0
-Release:	0.3
+Release:	0.5
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/%{version}/Source/MySQL-zrm-%{version}-release.tar.gz
 # Source0-md5:	dbc09406c04f5a21c09d582af6b1fe34
+Patch0:		tar-options.patch
 URL:		http://www.zmanda.com/backup-mysql.html
 BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	%{name}-client = %{version}-%{release}
@@ -59,6 +60,7 @@ for MySQL remotely.
 
 %prep
 %setup -qc
+%patch0 -p1
 
 mv .%{_docdir}/MySQL-zrm-%{version} doc
 mv doc/* .
@@ -66,6 +68,7 @@ mv doc/* .
 # solaris inetd
 mv .%{_datadir}/%{name}/plugins/xinetd.smf .
 
+# TODO: package later
 mv .%{_sysconfdir}/xinetd.d/mysql-zrm-socket-server .
 
 %install
diff --git a/tar-options.patch b/tar-options.patch
new file mode 100644
index 0000000..c614ce5
--- /dev/null
+++ b/tar-options.patch
@@ -0,0 +1,23 @@
+BUG: avoid -s conflict with -s:
+
+dcdb:backup:INFO: Command used is 'tar  --same-owner -cpsC  "/var/lib/mysql-zrm/dcdb/20140501182716"  --exclude=backup-data  --exclude=index  --exclude=zrm_checksum  --exclude=backup-sql . 2>/tmp/tMf0msYFKr  | gzip 2>/tmp/ZynafP65U4 > "/var/lib/mysql-zrm/dcdb/20140501182716/backup-data" 2>/tmp/XrkIPv63q2'
+dcdb:backup:INFO: Output of command: 'tar' is {
+tar: --same-order option cannot be used with -c
+ Try 'tar --help' or 'tar --usage' for more information.
+}
+dcdb:backup:INFO: compress=   
+dcdb:backup:INFO: backup-size-compressed=0.00 MB
+
+--- mysql-zrm-3.0/./usr/lib/mysql-zrm/ZRM/Common.pm~	2013-08-26 23:45:36.000000000 +0300
++++ mysql-zrm-3.0/./usr/lib/mysql-zrm/ZRM/Common.pm	2014-05-01 18:33:43.579363466 +0300
+@@ -91,8 +91,8 @@
+ our $MYSQL_ZRM_CONFIG_FILE=catfile( $MYSQL_ZRM_BASEDIR, "mysql-zrm.conf");
+ #Compress & Encrypt progs
+ our $TAR="tar";
+-our $TAR_COMPRESS_OPTIONS=" --same-owner -cpsC ";
+-our $TAR_UNCOMPRESS_OPTIONS=" --same-owner -xpsC ";
++our $TAR_COMPRESS_OPTIONS=" --same-owner -cpC ";
++our $TAR_UNCOMPRESS_OPTIONS=" --same-owner -xpC ";
+ our $TAR_EXCLUDE_OPTION=" --exclude";
+ our $COMPRESS_FILENAME="backup-data";
+ our $COMPRESS_LOGICAL_FILENAME="backup-sql";
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-zrm.git/commitdiff/1673eb946741147cdd2940b0b23022b1f1e4796b