From 8346c1606a007135f84060d049e6a206cda737da Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Jun 14 2011 09:15:17 +0000
Subject: Update to 0.4b44.


- patches merged
  - dump-rh507948.patch
  - dump-0.4b42-ext4.patch

Signed-off-by: Adam Tkac <atkac@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index ba8d72f..2586b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 dump-0.4b43.tar.gz
+/dump-0.4b44.tar.gz
diff --git a/dump-0.4b42-ext4.patch b/dump-0.4b42-ext4.patch
deleted file mode 100644
index dceb2a2..0000000
--- a/dump-0.4b42-ext4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dump-0.4b42/dump/optr.c.ext4 dump-0.4b42/dump/optr.c
---- dump-0.4b42/dump/optr.c.ext4	2006-03-14 12:09:51.000000000 +0100
-+++ dump-0.4b42/dump/optr.c	2010-12-02 15:52:09.752382850 +0100
-@@ -78,7 +78,7 @@ int	datesort __P((const void *, const vo
- static	void sendmes __P((const char *, const char *));
- 
- /* List of filesystem types that we can dump (same ext2 on-disk format) */
--static char *fstypes[] = { "ext2", "ext3", "InterMezzo", NULL };
-+static char *fstypes[] = { "ext2", "ext3", "ext4", "InterMezzo", NULL };
- 
- /*
-  *	Query the operator; This previously-fascist piece of code
diff --git a/dump-rh507948.patch b/dump-rh507948.patch
deleted file mode 100644
index b1d1a23..0000000
--- a/dump-rh507948.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up dump-0.4b42/restore/tape.c.rh507948 dump-0.4b42/restore/tape.c
---- dump-0.4b42/restore/tape.c.rh507948	2009-07-23 14:28:17.998903816 +0200
-+++ dump-0.4b42/restore/tape.c	2009-07-23 14:29:27.058903991 +0200
-@@ -3264,11 +3263,14 @@ ReReadInodeFromTape(dump_ino_t theino)
- 		cntloop++;
- 		gethead(&spcl);
- 	} while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate));
-+
-+	tpblksread = spcl.c_tapea + spcl.c_volume;
- #ifdef DEBUG_QFA
- 	fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
- 	fprintf(stderr, "DEBUG: bufsize %ld\n", bufsize);
- 	fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
--	fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
-+	fprintf(stderr, "DEBUG: tapea %d\n", spcl.c_tapea);
-+	fprintf(stderr, "DEBUG: tpblksread %ld\n", tpblksread);
- #endif
- 	findinode(&spcl);
- 	noresyncmesg = 0;
---- dump-0.4b39/restore/restore.c	2004-12-15 12:00:01.000000000 +0100
-+++ dump-0.4b39/restore/restore.c.rh507948	2010-02-02 16:50:03.817507952 +0100
-@@ -880,14 +880,15 @@ createfiles(void)
- 	Vprintf(stdout, "Extract requested files\n");
- 	curfile.action = SKIP;
- #ifdef USE_QFA
--	if (tapeposflag)
--		curfile.ino = 0;
--	else
-+	if (!tapeposflag) {
- #endif
- 		if (volinfo[1] == ROOTINO)
- 			curfile.ino = 0;
- 		else
- 			getvol((long)1);
-+#ifdef USE_QFA
-+	}
-+#endif
- 	skipmaps();
- 	skipdirs();
- 	first = lowerbnd(ROOTINO);
diff --git a/dump.spec b/dump.spec
index d68591e..571214c 100644
--- a/dump.spec
+++ b/dump.spec
@@ -1,13 +1,13 @@
 %define _sbindir /sbin
 
-%define PREVER b43
+%define PREVER b44
 %define VERSION 0.4%{PREVER}
 
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Epoch: 1
 Version: 0.4
-Release: 0.10.%{PREVER}%{?dist}
+Release: 0.11.%{PREVER}%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -23,9 +23,6 @@ Requires: rmt
 Obsoletes: dump-static
 Provides: dump-static
 
-Patch0: dump-rh507948.patch
-Patch1: dump-0.4b42-ext4.patch
-
 %description
 The dump package contains both dump and restore. Dump examines files
 in a filesystem, determines which ones need to be backed up, and
@@ -50,9 +47,6 @@ restoring files from a backup), and tar (an archiving program).
 %prep
 %setup -q -n dump-%{VERSION}
 
-%patch0 -p1 -b .rh507948
-%patch1 -p1 -b .ext4
-
 for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
     iconv -f iso-8859-1 -t utf-8  $i -o $i.new
     touch -r $i $i.new
@@ -127,6 +121,12 @@ rm -rf %{buildroot}
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Tue Jun 14 2011 Adam Tkac <atkac redhat com> 0.4-0.11.b44
+- update to 0.4b44
+- patches merged
+  - dump-rh507948.patch
+  - dump-0.4b42-ext4.patch
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.4-0.10.b43
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3a6ea8f..68cb768 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a708cbac8a0f69dd55aecbb80bb290ca  dump-0.4b43.tar.gz
+daec97b1ad905c904eba926221f4be6d  dump-0.4b44.tar.gz