From 0f45dc012fae4558e803e315b3d0b63465c914075187b093557ae5861da73f0e Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Thu, 9 Feb 2012 10:46:12 +0000
Subject: [PATCH] Accepting request 103436 from
 home:rjschwei:branches:Base:System

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/103436
OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=25
---
 dosfstools.changes |  5 +++++
 dosfstools.spec    | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dosfstools.changes b/dosfstools.changes
index 73411e9..cf1f5a0 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb  8 20:39:33 UTC 2012 - rschweikert@suse.com
+
+- place binaries in /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Fri Sep 30 14:51:02 UTC 2011 - uli@suse.com
 
diff --git a/dosfstools.spec b/dosfstools.spec
index 0602cdc..4fdeca2 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dosfstools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,13 @@
 #
 
 
-
 Name:           dosfstools
 Provides:       mkdosfs dosfsck
-License:        GPLv3
-Group:          System/Filesystems
 Summary:        Utilities for Making and Checking MS-DOS FAT File Systems on Linux
+License:        GPL-3.0
+Group:          System/Filesystems
 Version:        3.0.10
-Release:        14
+Release:        0
 Url:            http://freshmeat.net/projects/dosfstools
 Source:         %{name}_%{version}.orig.tar.bz2
 Patch0:         %{name}-suse-dirs.patch
@@ -49,12 +48,19 @@ drives or on floppies.
 make CC="%__cc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
-%makeinstall
+%makeinstall SBINDIR=%{_sbindir}
+#UsrMerge
+mkdir $RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos} $RPM_BUILD_ROOT/sbin
+#EndUsrMerge
 
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}
+#UsrMerge
 /sbin/*
+#EndUsrMerge
+%{_sbindir}/*
 %{_mandir}/man8/*.gz
 
 %changelog