From 0bfc15fe0289027ad56bd90186abd2943ba00231 Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Dec 09 2004 10:08:32 +0000
Subject: updated to 2.10


---

diff --git a/.cvsignore b/.cvsignore
index e600aa8..923beb6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dosfstools-2.8.src.tar.gz
+dosfstools-2.10.src.tar.gz
diff --git a/dosfstools-2.7-argfix.patch b/dosfstools-2.7-argfix.patch
index 2c4479c..ad31d06 100644
--- a/dosfstools-2.7-argfix.patch
+++ b/dosfstools-2.7-argfix.patch
@@ -1,24 +1,15 @@
---- dosfstools-2.7/mkdosfs/mkdosfs.c.argfix	Fri Jul  6 11:25:46 2001
-+++ dosfstools-2.7/mkdosfs/mkdosfs.c	Fri Jul  6 11:27:03 2001
-@@ -1600,6 +1600,12 @@
-       }
- 
-   device_name = argv[optind];	/* Determine the number of blocks in the FS */
+--- dosfstools-2.10/mkdosfs/mkdosfs.c.argfix	2003-06-14 22:07:08.000000000 +0200
++++ dosfstools-2.10/mkdosfs/mkdosfs.c	2004-12-07 15:38:38.798018438 +0100
+@@ -1619,6 +1619,12 @@
+   if (optind < argc)
+     {
+       device_name = argv[optind];  /* Determine the number of blocks in the FS */
 +
-+  if (!device_name) {
-+      printf("No device specified.\n");
-+      usage();
-+  }
-+      
-   if (!create)
-     i = count_blocks (device_name); /*  Have a look and see! */
-   if (optind == argc - 2)	/*  Either check the user specified number */
-@@ -1628,7 +1634,7 @@
- 
-   if (check && listfile)	/* Auto and specified bad block handling are mutually */
-     die ("-c and -l are incompatible");		/* exclusive of each other! */
--
-+  
-   if (!create) {
-     check_mount (device_name);	/* Is the device already mounted? */
-     dev = open (device_name, O_RDWR);	/* Is it a suitable device to build the FS on? */
++      if (!device_name) {
++	  printf("No device specified.\n");
++	  usage();
++      }
++
+       if (!create)
+          i = count_blocks (device_name); /*  Have a look and see! */
+     }
diff --git a/dosfstools.spec b/dosfstools.spec
index cf16864..53dd114 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,18 +1,17 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
-Version: 2.8
-Release: 16
+Version: 2.10
+Release: 1
 License: GPL
 Group: Applications/System
-Source: ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/dosfstools-%{version}.src.tar.gz
+Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
 Patch0: dosfstools-2.7-s390.patch
 Patch1: dosfstools-2.7-argfix.patch
-Patch2: dosfstools-llseek.patch
+Patch2: dosfstools-2.8-llseek.patch
 Patch3: dosfstools-2.8-loopsize.patch
 Patch4: dosfstools-2.8-autofat32.patch
 Patch5: dosfstools-2.8-endian.patch
 Patch6: dosfstools-2.8-types.patch
-Patch7: dosfstools-2.8-fat_length.patch
 Patch8: dosfstools-2.8-limits.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: mkdosfs-ygg
@@ -26,12 +25,11 @@ drives or on floppies.
 %setup -q
 %patch0 -p1 -b .s390
 %patch1 -p1 -b .argfix
-%patch2 -p1
+%patch2 -p1 -b .llseek
 %patch3 -p1 -b .loopsize
 %patch4 -p1 -b .autofat32
 %patch5 -p1 -b .endian
 %patch6 -p1 -b .types
-%patch7 -p1 -b .fat_length
 %patch8 -p1 -b .limits
 
 %build
@@ -66,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Thu Dec 09 2004 Peter Vrabec <pvrabec@redhat.com>  2.10-1
+- updated to 2.10
+
 * Wed Nov 10 2004 Martin Stransky <stransky@redhat.com> 2.8-16
 - add check for minimum count of clusters in FAT16 and FAT32
 
diff --git a/sources b/sources
index 40acbc5..2228e40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2df01c3c22090bee21ca5af6f56c298  dosfstools-2.8.src.tar.gz
+59a02f311a891af8787c4c9e28c6b89b  dosfstools-2.10.src.tar.gz