upgrade

.cvsignore

@@ -1 +1 @@
-dosfstools-2.10.src.tar.gz
+dosfstools-2.11.src.tar.gz

dosfstools-2.11-assumeKernel26.patch

@@ -0,0 +1,67 @@
+/*
+ * LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) does not work with glibc-kernheaders-2.4-9.1.94
+ * pvrabec@redhat.com
+ */
+
+--- dosfstools-2.11/dosfsck/common.h.assumeKernel26	2005-10-12 10:49:47.000000000 -0400
++++ dosfstools-2.11/dosfsck/common.h	2005-10-12 10:51:34.000000000 -0400
+@@ -2,13 +2,8 @@
+ 
+ /* Written 1993 by Werner Almesberger */
+ 
+-#include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+-# define __KERNEL__
+ # include <asm/types.h>
+-# undef __KERNEL__
+ # define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
+-#endif
+ 
+ #ifndef _COMMON_H
+ #define _COMMON_H
+--- dosfstools-2.11/dosfsck/file.c.assumeKernel26	2005-10-12 10:49:24.000000000 -0400
++++ dosfstools-2.11/dosfsck/file.c	2005-10-12 10:50:52.000000000 -0400
+@@ -16,12 +16,7 @@
+ #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
+ #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
+ 
+-#include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+-# define __KERNEL__
+ # include <asm/types.h>
+-# undef __KERNEL__
+-#endif
+ 
+ #include <linux/msdos_fs.h>
+ 
+--- dosfstools-2.11/dosfsck/dosfsck.h.assumeKernel26	2005-10-12 10:50:02.000000000 -0400
++++ dosfstools-2.11/dosfsck/dosfsck.h	2005-10-12 10:51:52.000000000 -0400
+@@ -14,13 +14,8 @@
+ #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
+ #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
+ 
+-#include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+-# define __KERNEL__
+ # include <asm/types.h>
+ # include <asm/byteorder.h>
+-# undef __KERNEL__
+-#endif
+ 
+ #include <linux/msdos_fs.h>
+ 
+--- dosfstools-2.11/mkdosfs/mkdosfs.c.assumeKernel26	2005-10-12 10:50:12.000000000 -0400
++++ dosfstools-2.11/mkdosfs/mkdosfs.c	2005-10-12 10:52:30.000000000 -0400
+@@ -66,12 +66,7 @@
+ #include <time.h>
+ #include <errno.h>
+ 
+-#include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+-# define __KERNEL__
+ # include <asm/types.h>
+-# undef __KERNEL__
+-#endif
+ 
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ 

dosfstools.spec

@@ -1,19 +1,12 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
-Version: 2.10
-Release: 3
+Version: 2.11
+Release: 1
 License: GPL
 Group: Applications/System
 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-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
-Patch8: dosfstools-2.8-limits.patch
-Patch9: dosfstools-2.10-getgeo.patch
+Patch2: dosfstools-2.11-assumeKernel26.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: mkdosfs-ygg
@@ -25,15 +18,8 @@ drives or on floppies.
 
 %prep
 %setup -q
-%patch0 -p1 -b .s390
 %patch1 -p1 -b .argfix
-%patch2 -p1 -b .llseek
-%patch3 -p1 -b .loopsize
-%patch4 -p1 -b .autofat32
-%patch5 -p1 -b .endian
-%patch6 -p1 -b .types
-%patch8 -p1 -b .limits
-%patch9 -p1 -b .getgeo
+%patch2 -p1 -b .assumeKernel26
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -Dllseek=lseek64 -D_LARGEFILE64_SOURCE"
@@ -67,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Wed Oct 12 2005 Peter Vrabec <pvrabec@redhat.com> 2.11-1
+- upgrade
+
 * Thu Apr 28 2005 Peter Vrabec <pvrabec@redhat.com> 2.10-3
 - if HDIO_GETGEO fails, print a warning and default to H=255,S=63 (#155950)
 

sources

@@ -1 +1 @@
-59a02f311a891af8787c4c9e28c6b89b  dosfstools-2.10.src.tar.gz
+407d405ade410f7597d364ab5dc8c9f6  dosfstools-2.11.src.tar.gz