From 3bc48cf1347711753877891f50e6334699a1b9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 8 Oct 2010 09:56:28 +0200
Subject: [PATCH] - Fixed dosfsck and dosfslabel on s390x (#624596)

---
 dosfstools-3.0.10-s390x-unalign.patch | 11 +++++++++++
 dosfstools.spec                       |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 dosfstools-3.0.10-s390x-unalign.patch

diff --git a/dosfstools-3.0.10-s390x-unalign.patch b/dosfstools-3.0.10-s390x-unalign.patch
new file mode 100644
index 0000000..9c6bbc6
--- /dev/null
+++ b/dosfstools-3.0.10-s390x-unalign.patch
@@ -0,0 +1,11 @@
+--- dosfstools-3.0.9/src/boot.c.old	2010-01-23 10:13:11.000000000 +0100
++++ dosfstools-3.0.9/src/boot.c	2010-10-06 13:50:55.028885433 +0200
+@@ -59,7 +59,7 @@
+     { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" },
+ };
+ 
+-#if defined __alpha || defined __arm || defined __arm__ || defined __ia64__ || defined __s390x__ \
++#if defined __alpha || defined __arm || defined __arm__ || defined __ia64__ \
+  || defined __x86_64__ || defined __ppc64__ || defined __bfin__ \
+  || defined __MICROBLAZE__
+ /* Unaligned fields must first be copied byte-wise */
diff --git a/dosfstools.spec b/dosfstools.spec
index fd82c38..60ea27b 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,12 +1,14 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
 URL: http://www.daniel-baumann.ch/software/dosfstools/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix dosfsck and dosfslabel on s390x
+Patch0: dosfstools-3.0.10-s390x-unalign.patch
 
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -15,6 +17,7 @@ drives or on floppies.
 
 %prep
 %setup -q
+%patch0 -p1 -b .s390x-unalign
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
@@ -33,6 +36,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Fri Oct 08 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.10-2
+- Fixed dosfsck and dosfslabel on s390x (#624596)
+
 * Wed Oct 06 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.10-1
 - Bump to newer release