From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 21 May 2008 13:15:27 +0000 (+0000)
Subject: - up to 2.6.0p1
X-Git-Tag: auto/th/amanda-2_6_0p1-1~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=cb35b8e1bdca9e4f9f2d9c09169f3ea990da95bc;p=packages%2Famanda.git

- up to 2.6.0p1

Changed files:
    amanda-bashizm.patch -> 1.5
---

diff --git a/amanda-bashizm.patch b/amanda-bashizm.patch
index 61ec7d5..c2bbbf3 100644
--- a/amanda-bashizm.patch
+++ b/amanda-bashizm.patch
@@ -1,14 +1,14 @@
 --- amanda-2.6.0/config/amanda/dumpers.m4~	2008-03-03 14:50:51.000000000 +0100
 +++ amanda-2.6.0/config/amanda/dumpers.m4	2008-05-07 11:13:49.000000000 +0200
 @@ -41,7 +41,7 @@
-     fi
- 
-     if test ! -z "$GNUTAR"; then
--      case "`\"$GNUTAR\" --version 2>&1`" in
-+      case "`$GNUTAR --version 2>&1`" in
-        *GNU*tar* | *Free*paxutils* ) : # OK, it is GNU tar
- 		    ;;
-        *)
+ 	for gnutar_name in gtar gnutar tar; do
+ 	    AC_PATH_PROGS(GNUTAR, $gnutar_name, , $LOCSYSPATH)
+ 	    if test -n "$GNUTAR"; then
+-	      case "`\"$GNUTAR\" --version 2>&1`" in
++	      case "`$GNUTAR --version 2>&1`" in
+ 	       *GNU*tar* | *Free*paxutils* )
+ 			    # OK, it is GNU tar
+ 			    break
 @@ -103,7 +103,7 @@
        AC_PATH_PROG(SAMBA_CLIENT,smbclient,,$LOCSYSPATH)
        smbversion=0