rpms/dump/devel dump-rh489853.patch, NONE, 1.1 dump-rh490627.patch, NONE, 1.1 dump-rh493635.patch, NONE, 1.1 dump.spec, 1.51, 1.52

Adam Tkac atkac at fedoraproject.org
Mon Apr 6 15:12:25 UTC 2009 

Author: atkac

Update of /cvs/pkgs/rpms/dump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21193

Modified Files:
	dump.spec 
Added Files:
	dump-rh489853.patch dump-rh490627.patch dump-rh493635.patch 
Log Message:
- display dump level correctly in all cases (#493635)
- -A option is not valid when -P is specified, correct manual page (#490627)
- fix typos in manual pages (#489853)


dump-rh489853.patch:

--- NEW FILE dump-rh489853.patch ---
diff -up dump-0.4b41/dump/dump.8.in.rh489853 dump-0.4b41/dump/dump.8.in
--- dump-0.4b41/dump/dump.8.in.rh489853	2009-04-06 16:50:26.042022876 +0200
+++ dump-0.4b41/dump/dump.8.in	2009-04-06 16:51:04.966485882 +0200
@@ -434,7 +434,7 @@ option causes
 .B dump
 to print out, for all file systems in
 .I __DUMPDATES__ ,
-and regognized file systems in
+and recognized file systems in
 .I /etc/mtab
 and
 .IR /etc/fstab .
@@ -598,7 +598,7 @@ correctly with either pre-0.4b34 or 0.4b
 .B dump
 provided that the machine on which
 .B dump
-is run did not change timezones (which should be a fairly rare occurence).
+is run did not change timezones (which should be a fairly rare occurrence).
 .SH EXIT STATUS
 .B Dump
 exits with zero status on success. Startup errors are indicated with an exit
@@ -615,7 +615,7 @@ from dump can be parsed to look for line
 When a read error occurs,
 .B dump
 prints out the corresponding physical disk block and sector number and the
-ext2/3 logical block number. It doesn't print out the corresponing file name or
+ext2/3 logical block number. It doesn't print out the corresponding file name or
 even the inode number. The user has to use 
 .BR debugfs (8),
 commands
@@ -652,7 +652,7 @@ The 
 backup suite was ported to Linux's Second Extended File System by Remy Card 
 <card at Linux.EU.Org>. He maintained the initial versions of 
 .B dump
-(up and including 0.4b4, released in january 1997).
+(up and including 0.4b4, released in January 1997).
 .PP
 Starting with 0.4b5, the new maintainer is Stelian Pop <stelian at popies.net>.
 .SH AVAILABILITY
diff -up dump-0.4b41/restore/restore.8.in.rh489853 dump-0.4b41/restore/restore.8.in
--- dump-0.4b41/restore/restore.8.in.rh489853	2009-04-06 16:51:15.498003818 +0200
+++ dump-0.4b41/restore/restore.8.in	2009-04-06 16:51:31.606435999 +0200
@@ -377,7 +377,7 @@ prevents hierarchical restoration of com
 .BI \-H " hash_size"
 Use a hashtable having the specified number of entries for storing the
 directories entries instead of a linked list. This hashtable will
-considerably speed up inode lookups (visible especialy in interactive
+considerably speed up inode lookups (visible especially in interactive
 mode when adding/removing files from the restore list), but at the
 price of much more memory usage. The default value is 1, meaning no
 hashtable is used.
@@ -751,7 +751,7 @@ The
 backup suite was ported to Linux's Second Extended File System by Remy Card 
 <card at Linux.EU.Org>. He maintained the initial versions of 
 .B dump
-(up and including 0.4b4, released in january 1997).
+(up and including 0.4b4, released in January 1997).
 .PP
 Starting with 0.4b5, the new maintainer is Stelian Pop <stelian at popies.net>.
 .SH AVAILABILITY

dump-rh490627.patch:

--- NEW FILE dump-rh490627.patch ---
diff -up dump-0.4b41/restore/main.c.rh490627 dump-0.4b41/restore/main.c
--- dump-0.4b41/restore/main.c.rh490627	2009-04-06 16:48:15.730002753 +0200
+++ dump-0.4b41/restore/main.c	2009-04-06 16:48:24.578003355 +0200
@@ -727,7 +727,7 @@ usage(void)
 		"\t%s -i [-acd" tseflag "hH" kerbflag "lmMouvVy] [-A file] [-b blocksize] " tsEflag"\n"
 		"\t%s    [-f file] [-F script] " qfaflag "[-s fileno]\n"
 #ifdef USE_QFA
-		"\t%s -P file [-acdhH" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+		"\t%s -P file [-acdhH" kerbflag "lmMuvVy] [-b blocksize]\n"
 		"\t%s    [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
 #endif
 		"\t%s -r [-cd" tseflag "H" kerbflag "lMuvVy] [-b blocksize] " tsEflag"\n"
diff -up dump-0.4b41/restore/restore.8.in.rh490627 dump-0.4b41/restore/restore.8.in
--- dump-0.4b41/restore/restore.8.in.rh490627	2009-04-06 16:46:35.046519977 +0200
+++ dump-0.4b41/restore/restore.8.in	2009-04-06 16:47:03.318003509 +0200
@@ -54,7 +54,6 @@ restore \- restore files or file systems
 .B restore \-P 
 .I file
 [\fB\-acdhHklmMNuvVy\fR]
-[\fB\-A \fIfile\fR]
 [\fB\-b \fIblocksize\fR]
 [\fB\-f \fIfile\fR]
 [\fB\-F \fIscript\fR]

dump-rh493635.patch:

--- NEW FILE dump-rh493635.patch ---
diff -up dump-0.4b41/dump/main.c.rh493635 dump-0.4b41/dump/main.c
--- dump-0.4b41/dump/main.c.rh493635	2009-04-06 16:28:17.534367185 +0200
+++ dump-0.4b41/dump/main.c	2009-04-06 16:32:15.762151077 +0200
@@ -239,6 +239,8 @@ main(int argc, char *argv[])
 		quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
 	memset(&lastlevel, 0, NUM_STR_SIZE);
 	memset(&level, 0, NUM_STR_SIZE);
+	/* Default dump level is zero. */
+	level[0] = '0';
 
 	if (argc < 2)
 		usage();


Index: dump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dump/devel/dump.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dump.spec	9 Mar 2009 13:37:33 -0000	1.51
+++ dump.spec	6 Apr 2009 15:11:54 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Version: 0.4b41
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -15,6 +15,9 @@
 Patch2: dump-immutable.patch
 Patch4: dump-0.4b41-libtinfo.patch
 Patch5: dump-rh356121.patch
+Patch6: dump-rh493635.patch
+Patch7: dump-rh490627.patch
+Patch8: dump-rh489853.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2
 BuildRequires: zlib-devel, bzip2-devel, automake
@@ -54,6 +57,9 @@
 %patch2 -p1 -b .orig
 %patch4 -p1 -b .libtinfo
 %patch5 -p1 -b .rh356121
+%patch6 -p1 -b .rh493635
+%patch7 -p1 -b .rh490627
+%patch8 -p1 -b .rh489853
 
 for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
     iconv -f iso-8859-1 -t utf-8  $i -o $i.new
@@ -126,6 +132,11 @@
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Mon Apr 04 2009 Adam Tkac <atkac redhat com> 0.4b41-13
+- display dump level correctly in all cases (#493635)
+- -A option is not valid when -P is specified, correct manual page (#490627)
+- fix typos in manual pages (#489853)
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> 0.4b41-12
 - correct manual page (dump level is 0 by default, #356121)

More information about the scm-commits mailing list