From 8541e0c5f345a58eb5e6da3637812add5abb2343 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:19:47 +0000
Subject: auto-import changelog data from dosfstools-2.7-1.src.rpm

Fri Jul 06 2001 Preston Brown <pbrown@redhat.com>
- major upgrade to v2.7.
- forward port old ia64 patch (now incorporated) s390 additions

---

diff --git a/.cvsignore b/.cvsignore
index 73512ba..2698bde 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dosfstools-2.2.src.tar.gz
+dosfstools-2.7.src.tar.gz
diff --git a/dosfstools-2.7-argfix.patch b/dosfstools-2.7-argfix.patch
new file mode 100644
index 0000000..2c4479c
--- /dev/null
+++ b/dosfstools-2.7-argfix.patch
@@ -0,0 +1,24 @@
+--- 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 */
++
++  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? */
diff --git a/dosfstools.spec b/dosfstools.spec
index dca2670..146dcd0 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,17 +1,13 @@
-%define version 2.2
-
-Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Name: dosfstools
-Version: %{version}
-Release: 9
-Copyright: GPL
+Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
+Version: 2.7
+Release: 1
+License: GPL
 Group: Applications/System
-Source: ftp://metalab.unc.edu/pub/Linux/system/filesystems/dosfs/dosfstools-%{version}.src.tar.gz
-Patch0: dosfstools-2.1-llseek.patch
-Patch1: dosfstools-2.2-288.patch
-Patch2: dosfstools-2.2-ia64.patch
-Patch3: dosfstools-2.2-linux24.patch
-BuildRoot: /var/tmp/dosfstools-root
+Source: ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/dosfstools-%{version}.src.tar.gz
+Patch0: dosfstools-2.7-s390.patch
+Patch1: dosfstools-2.7-argfix.patch
+BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: mkdosfs-ygg
 
 %description
@@ -21,42 +17,48 @@ drives or on floppies.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -b .linux24
+%patch0 -p1 -b .s390
+%patch1 -p1 -b .argfix
 
 %build
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/sbin
+mkdir -p %{buildroot}/%{_mandir}/man8
+
+install -m755 -s mkdosfs/mkdosfs %{buildroot}/sbin/mkdosfs
+ln %{buildroot}/sbin/mkdosfs %{buildroot}/sbin/mkfs.vfat
+ln %{buildroot}/sbin/mkdosfs %{buildroot}/sbin/mkfs.msdos
 
-install -m755 -s mkdosfs/mkdosfs $RPM_BUILD_ROOT/sbin/mkfs.msdos
-ln $RPM_BUILD_ROOT/sbin/mkfs.msdos $RPM_BUILD_ROOT/sbin/mkdosfs
-install -m 644 mkdosfs/mkdosfs.8 $RPM_BUILD_ROOT%{_mandir}/man8
-ln -sf mkdosfs.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.msdos.8.gz
+install -m755 -s dosfsck/dosfsck %{buildroot}/sbin/dosfsck
+ln %{buildroot}/sbin/dosfsck %{buildroot}/sbin/fsck.msdos
+ln %{buildroot}/sbin/dosfsck %{buildroot}/sbin/fsck.vfat
 
-install -m755 -s dosfsck/dosfsck $RPM_BUILD_ROOT/sbin/dosfsck
-ln $RPM_BUILD_ROOT/sbin/dosfsck $RPM_BUILD_ROOT/sbin/fsck.msdos
-install -m 644 dosfsck/dosfsck.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -m 644 mkdosfs/mkdosfs.8 %{buildroot}%{_mandir}/man8
+ln -sf mkdosfs.8.gz %{buildroot}%{_mandir}/man8/mkfs.msdos.8.gz
+ln -sf mkdosfs.8.gz %{buildroot}%{_mandir}/man8/mkfs.vfat.8.gz
+
+install -m 644 dosfsck/dosfsck.8 %{buildroot}%{_mandir}/man8
+ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.vfat.8.gz
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-/sbin/mkfs.msdos 
-/sbin/mkdosfs
-/sbin/dosfsck
-/sbin/fsck.msdos
-%{_mandir}/man8/mkfs.msdos.8*
-%{_mandir}/man8/mkdosfs.8*
-%{_mandir}/man8/dosfsck.8*
+/sbin/*
+%{_mandir}/man8/*
 
 %changelog
+* Fri Jul  6 2001 Preston Brown <pbrown@redhat.com>
+- major upgrade to v2.7.
+- forward port old ia64 patch (now incorporated) s390 additions
+
+* Tue Mar 20 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
+- ported to zSeries (64 bit)
+
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 
diff --git a/sources b/sources
index 7581a1f..7309156 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0602f267f52c257b59cba7225eadfff5  dosfstools-2.2.src.tar.gz
+5a07be19a0035856c4a185fe2f695cf8  dosfstools-2.7.src.tar.gz