From bbdb3e4e2e85a9f80ea6f030c5d9e41654c92b41 Mon Sep 17 00:00:00 2001 From: Radek Brich Date: Aug 10 2007 11:38:01 +0000 Subject: patch for #251316 --- diff --git a/amanda-2.5.2p1-typo_chg_multi.patch b/amanda-2.5.2p1-typo_chg_multi.patch new file mode 100644 index 0000000..a106180 --- /dev/null +++ b/amanda-2.5.2p1-typo_chg_multi.patch @@ -0,0 +1,20 @@ +--- amanda-2.5.2p1/changer-src/chg-multi.sh.in.typo_chg_multi 2007-05-17 19:38:34.000000000 +0200 ++++ amanda-2.5.2p1/changer-src/chg-multi.sh.in 2007-08-09 14:34:21.000000000 +0200 +@@ -325,7 +325,7 @@ then + echo $answer + exit 2 + fi +- echo `_ ' -> offline'` "$device"` >> $logfile ++ echo `_ ' -> offline'` "$device" >> $logfile + $MT $MTF $device offline >> $logfile 2>&1 + if [ $? -ne 0 ]; then + answer=`_ '%s %s: %s: unable to change to slot %s' "$newslot" "$pname" "$device" "$curslot"` +@@ -404,7 +404,7 @@ if [ $loadslot -eq 1 ]; then # load the + # try to rewind the device + device=`awk '$1 == "slot" && $2 == '$curslot' {print $3}' $ourconf 2>/dev/null` + if [ "$device" = "" ]; then +- answer=`_ "%s %s: slot %s device not specified in %s' "$curslot" "$pname" "$curslot" "$ourconf"` ++ answer=`_ '%s %s: slot %s device not specified in %s' "$curslot" "$pname" "$curslot" "$ourconf"` + echo `_ 'Exit ->'` $answer >> $logfile + echo $answer + exit 2 diff --git a/amanda.spec b/amanda.spec index 6c3ef9c..97e491d 100644 --- a/amanda.spec +++ b/amanda.spec @@ -11,7 +11,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 2.5.2p1 -Release: 5%{?dist} +Release: 6%{?dist} Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -21,6 +21,7 @@ Patch1: amanda-2.5.2p1-pie.patch Patch3: amanda-2.5.2p1-ylwrapNotFound.patch Patch4: amanda-2.5.2p1-undefSymbols.patch Patch5: amanda-2.5.2p1-xattrs.patch +Patch6: amanda-2.5.2p1-typo_chg_multi.patch License: BSD Group: Applications/System URL: http://www.amanda.org @@ -85,6 +86,7 @@ be used to develop amanda applications. %patch3 -p1 -b .ylwrapNotFound %patch4 -p1 -b .undefSymbols %patch5 -p1 -b .xattrs +%patch6 -p1 -b .typo_chg_multi ./autogen %build @@ -336,7 +338,10 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %{_libdir}/libamandad.so %changelog -* Tue Aug 08 2007 Radek Brich 2.5.2.p1-5 +* Fri Aug 10 2007 Radek Brich 2.5.2.p1-6 +- Included upstream patch for chg-multi.sh (#251316). + +* Wed Aug 08 2007 Radek Brich 2.5.2.p1-5 - Added ssh and ncompress to BuildRequires (#250730). - Removed some obsolete makes from build section.