From 28129194377c443a157e77e547ffe6d5d262c0df53123a50495500a21d8c6528 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Thu, 26 Jun 2014 12:12:17 +0000
Subject: [PATCH] - added fsck.{v,}fat and mkfs.{v,}fat compat symlinks in
 /sbin   [bnc#884516] - call spec-cleaner

OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=58
---
 dosfstools.changes |  7 +++++++
 dosfstools.spec    | 29 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/dosfstools.changes b/dosfstools.changes
index 8f10f67..1453717 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 26 12:11:27 UTC 2014 - pgajdos@suse.com
+
+- added fsck.{v,}fat and mkfs.{v,}fat compat symlinks in /sbin
+  [bnc#884516]
+- call spec-cleaner
+
 -------------------------------------------------------------------
 Mon Mar 17 08:21:51 UTC 2014 - pgajdos@suse.com
 
diff --git a/dosfstools.spec b/dosfstools.spec
index 3cfa7dc..97cd115 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -17,26 +17,25 @@
 
 
 Name:           dosfstools
+Version:        3.0.26
+Release:        0
 Summary:        Utilities for Making and Checking MS-DOS FAT File Systems on Linux
 License:        GPL-3.0+
 Group:          System/Filesystems
-Version:        3.0.26
-Release:        0
 Url:            http://daniel-baumann.ch/software/dosfstools/
-
 #Freecode-URL:	http://freecode.com/projects/dosfstools
 #Git-Clone:	git://daniel-baumann.ch/git/software/dosfstools
-Source:         http://daniel-baumann.ch/files/software/dosfstools/%name-%version.tar.xz
-Source2:        http://daniel-baumann.ch/files/software/dosfstools/%name-%version.tar.xz.sig
-Source3:        %name.keyring
+Source:         http://daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz
+Source2:        http://daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz.sig
+Source3:        %{name}.keyring
 Patch0:         %{name}-suse-dirs.patch
+Supplements:    filesystem(vfat)
+Provides:       dosfsck
+Provides:       mkdosfs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
 %endif
-Provides:       dosfsck
-Provides:       mkdosfs
-Supplements:    filesystem(vfat)
 
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -44,18 +43,18 @@ which respectively make and check MS-DOS FAT file systems on hard
 drives or on floppies.
 
 %prep
-%{?gpg_verify: %gpg_verify %{S:2}}
-%setup
+%{?gpg_verify: %gpg_verify %{SOURCE2}}
+%setup -q
 %patch0 -p1
 
 %build
-make CC="%__cc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" %{?_smp_mflags}
+make CC="gcc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE %{optflags}" %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot" SBINDIR=%{_sbindir}
+make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
 #UsrMerge
-mkdir $RPM_BUILD_ROOT/sbin
-ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos} $RPM_BUILD_ROOT/sbin
+mkdir %{buildroot}/sbin
+ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin
 #EndUsrMerge
 
 %files