From 95593d9c9a8e7add9d060f463b3863a7405ae915 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Wed, 16 Jul 2008 21:30:05 +0000
Subject: [PATCH] fix license tag

---
 dosfstools-2.7-argfix.patch | 13 +++++++------
 dosfstools.spec             |  8 ++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dosfstools-2.7-argfix.patch b/dosfstools-2.7-argfix.patch
index ad31d06..5825fc8 100644
--- a/dosfstools-2.7-argfix.patch
+++ b/dosfstools-2.7-argfix.patch
@@ -1,15 +1,16 @@
---- 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 @@
+diff -up dosfstools-2.11/mkdosfs/mkdosfs.c.argfix dosfstools-2.11/mkdosfs/mkdosfs.c
+--- dosfstools-2.11/mkdosfs/mkdosfs.c.argfix	2005-03-12 11:12:16.000000000 -0500
++++ dosfstools-2.11/mkdosfs/mkdosfs.c	2008-07-16 17:26:49.000000000 -0400
+@@ -1634,6 +1634,12 @@ main (int argc, char **argv)
    if (optind < argc)
      {
        device_name = argv[optind];  /* Determine the number of blocks in the FS */
 +
 +      if (!device_name) {
-+	  printf("No device specified.\n");
-+	  usage();
++         printf("No device specified.\n");
++         usage();
 +      }
 +
        if (!create)
-          i = count_blocks (device_name); /*  Have a look and see! */
+          cblocks = count_blocks (device_name); /*  Have a look and see! */
      }
diff --git a/dosfstools.spec b/dosfstools.spec
index 9f40c20..1efcfa5 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,8 +1,8 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 2.11
-Release: 9%{?dist}
-License: GPL
+Release: 10%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
 URL: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools
@@ -60,6 +60,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 16 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11-10
+- fix license tag
+- fix patch to apply with fuzz=0
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.11-9
 - Autorebuild for GCC 4.3