[makebootfat] Make '-o usb' work again

[Dmitry Butskoy]

commit b05080d3ad7c7844bde8925347a0c85b565e90b9
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Wed Nov 17 17:07:26 2010 +0300

    Make '-o usb' work again

 makebootfat-1.4-newioctl.patch |   12 ++++++++++++
 makebootfat.spec               |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/makebootfat-1.4-newioctl.patch b/makebootfat-1.4-newioctl.patch
new file mode 100644
index 0000000..56507dd
--- /dev/null
+++ b/makebootfat-1.4-newioctl.patch
@@ -0,0 +1,12 @@
+diff -Naur makebootfat-1.4/disk.c makebootfat-1.4p/disk.c
+--- makebootfat-1.4/disk.c	2005-03-16 18:43:22.000000000 +0100
++++ makebootfat-1.4p/disk.c	2010-11-16 21:59:09.000000000 +0100
+@@ -597,7 +597,7 @@
+ 	}
+ 
+ 	/* exclude not USB mass storage device */
+-	if (strstr(hostname, "USB Mass Storage") == 0) {
++	if (strstr(hostname, "USB Mass Storage") == 0 && strstr(hostname, "usb-storage") == 0) {
+ 		goto err_close;
+ 	}
+ 
diff --git a/makebootfat.spec b/makebootfat.spec
index 130abb6..8c904f7 100644
--- a/makebootfat.spec
+++ b/makebootfat.spec
@@ -3,12 +3,13 @@
 Summary: Utility for creation bootable FAT disk
 Name: makebootfat
 Version: 1.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: 	Applications/System
 License: GPLv2+
 URL: http://advancemame.sourceforge.net/doc-makebootfat.html
 Source0: http://dl.sourceforge.net/sourceforge/advancemame/%{name}-%{version}.tar.gz
 Source1: makebootfat-README.usbboot
+Patch0:  makebootfat-1.4-newioctl.patch
 
 %if %{new_ldlinux}
 #  Get syslinux-VERSION.tar.bz2 from
@@ -39,6 +40,7 @@ can be successfully used separately for any purposes.
 
 %prep
 %setup -q
+%patch0 -p1
 
 install -p -m644 %{SOURCE1} README.usbboot
 
@@ -77,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 17 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.4-11
+- Fix '-o usb' option on new kernels (#653796,
+  patch from Dennis Czeremin <fedora at czeremin.de>)
+
 * Fri Jun 18 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.4-10
 - Compile without strict aliasing (#605549)