Accepting request 265411 from Archiving

1

OBS-URL: https://build.opensuse.org/request/show/265411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dump?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2014-12-17 18:16:56 +00:00 committed by Git OBS Bridge
commit 0dc9ae48f2
3 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,33 @@
diff -Ndur dump-0.4b43/examples/dump_on_cd_3/dump_disk dump-0.4b43-fix-bashisms/examples/dump_on_cd_3/dump_disk
--- dump-0.4b43/examples/dump_on_cd_3/dump_disk 2005-01-13 14:13:56.000000000 +0200
+++ dump-0.4b43-fix-bashisms/examples/dump_on_cd_3/dump_disk 2014-11-17 00:22:03.323002531 +0200
@@ -55,14 +55,14 @@
while [ "$ANSWER" != "y" ] ; do
echo -n "Is the disk ready? (y/n) "
read </dev/tty ANSWER
- if [ "$ANSWER" == "y" ] ; then
+ if [ "$ANSWER" = "y" ] ; then
(${RECORD_BIN}${1}) &
return 0
- elif [ "$ANSWER" == "n" ] ; then
+ elif [ "$ANSWER" = "n" ] ; then
EXIT=""
echo -n "Do you really want to exit? (y/n) "
read </dev/tty EXIT
- if [ "$EXIT" == "y" ] ; then
+ if [ "$EXIT" = "y" ] ; then
return 1
fi
fi
diff -Ndur dump-0.4b43/examples/remote_backup_ssh/backitup dump-0.4b43-fix-bashisms/examples/remote_backup_ssh/backitup
--- dump-0.4b43/examples/remote_backup_ssh/backitup 2001-11-11 01:56:07.000000000 +0200
+++ dump-0.4b43-fix-bashisms/examples/remote_backup_ssh/backitup 2014-11-17 00:22:30.163000715 +0200
@@ -41,7 +41,7 @@
# backup FILESYSTEMS to the TAPEDEV on TAPEHOST with DUMP as OPERATOR using RSH
export RMT RSH
-mkdir -p $LOGDIR &> /dev/null
+mkdir -p $LOGDIR > /dev/null 2>&1
ssh-add ~/.ssh/id_dsa
echo "Rewinding tape..."

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Nov 16 21:32:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashisms in example scripts
- add patches:
* dump-0.4b43-fix-bashisms.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 12 07:47:47 UTC 2013 - coolo@suse.com Sat Jan 12 07:47:47 UTC 2013 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package dump # spec file for package dump
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,6 +29,7 @@ Patch0: %{name}-%{version}-pathnames.patch
Patch1: %{name}-%{version}-destdir.patch Patch1: %{name}-%{version}-destdir.patch
Patch2: %{name}-%{version}-configure.patch Patch2: %{name}-%{version}-configure.patch
Patch3: %{name}-%{version}-include.patch Patch3: %{name}-%{version}-include.patch
Patch4: %{name}-0.4b43-fix-bashisms.patch
Url: http://dump.sourceforge.net/ Url: http://dump.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A Backup Program Summary: A Backup Program
@ -51,6 +52,7 @@ restore a full backup of a file system.
%patch1 %patch1
%patch2 %patch2
%patch3 %patch3
%patch4 -p1
%build %build
%define prefix /usr %define prefix /usr