From 3f1f465906c029a2c197e999eb8b8e13cecfbb928254181a8fda57c437440b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 26 Oct 2012 15:59:10 +0000
Subject: [PATCH] Accepting request 139467 from home:k0da:branches:Base:System

- hack to use just 1 sector for embedded devices. should be made
  into a flag, but this shouldn't break normal systems ...
  lunchpad bug (746262)
- fixes ppc boot from vfat (in case root on raid,lvm,ext4)

OBS-URL: https://build.opensuse.org/request/show/139467
OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=29
---
 dosfstools.changes             |  8 ++++++++
 dosfstools.spec                |  5 ++++-
 ppc-reserved-sectors-fix.patch | 13 +++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ppc-reserved-sectors-fix.patch

diff --git a/dosfstools.changes b/dosfstools.changes
index 3d9a63b..947c669 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 26 15:19:38 UTC 2012 - dvaleev@suse.com
+
+- hack to use just 1 sector for embedded devices. should be made 
+  into a flag, but this shouldn't break normal systems ...
+  lunchpad bug (746262)
+- fixes ppc boot from vfat (in case root on raid,lvm,ext4) 
+
 -------------------------------------------------------------------
 Fri Sep 28 11:18:14 UTC 2012 - cfarrell@suse.com
 
diff --git a/dosfstools.spec b/dosfstools.spec
index ba99b6d..58a8339 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -17,7 +17,8 @@
 
 
 Name:           dosfstools
-Provides:       mkdosfs dosfsck
+Provides:       dosfsck
+Provides:       mkdosfs
 Summary:        Utilities for Making and Checking MS-DOS FAT File Systems on Linux
 License:        GPL-3.0+
 Group:          System/Filesystems
@@ -29,6 +30,7 @@ Patch0:         %{name}-suse-dirs.patch
 Patch1:         %{name}-mdraid-partition.patch
 Patch2:         %{name}-label.patch
 Patch3:         %{name}-filename-buffer-overflow.patch
+Patch4:         ppc-reserved-sectors-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Supplements:    filesystem(vfat)
 
@@ -43,6 +45,7 @@ drives or on floppies.
 %patch1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make CC="%__cc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" %{?_smp_mflags}
diff --git a/ppc-reserved-sectors-fix.patch b/ppc-reserved-sectors-fix.patch
new file mode 100644
index 0000000..96b1841
--- /dev/null
+++ b/ppc-reserved-sectors-fix.patch
@@ -0,0 +1,13 @@
+Index: dosfstools-3.0.10/src/mkdosfs.c
+===================================================================
+--- dosfstools-3.0.10.orig/src/mkdosfs.c
++++ dosfstools-3.0.10/src/mkdosfs.c
+@@ -1059,7 +1059,7 @@ setup_tables (void)
+     }
+ 
+     /* Adjust the reserved number of sectors for alignment */
+-    reserved_sectors = align_object(reserved_sectors, bs.cluster_size);
++    /* reserved_sectors = align_object(reserved_sectors, bs.cluster_size); */
+     bs.reserved = CT_LE_W(reserved_sectors);
+ 
+     /* Adjust the number of root directory entries to help enforce alignment */