From 7de215ed4dd911de0790a4c90742617d7308a808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Wed, 17 Jul 2013 11:11:01 +0200
Subject: [PATCH] New version

  Resolves: rhbz#985279
- Dropped manpage-fix patch (upstreamed)
---
 dosfstools-3.0.20-manpage-fix.patch | 21 ---------------------
 dosfstools.spec                     | 12 +++++++-----
 sources                             |  2 +-
 3 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 dosfstools-3.0.20-manpage-fix.patch

diff --git a/dosfstools-3.0.20-manpage-fix.patch b/dosfstools-3.0.20-manpage-fix.patch
deleted file mode 100644
index 004b5d6..0000000
--- a/dosfstools-3.0.20-manpage-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up dosfstools-3.0.20/manpages/en/fsck.fat.8.orig dosfstools-3.0.20/manpages/en/fsck.fat.8
---- dosfstools-3.0.20/manpages/en/fsck.fat.8.orig	2013-06-12 11:30:18.000000000 +0200
-+++ dosfstools-3.0.20/manpages/en/fsck.fat.8	2013-06-25 14:28:51.000000000 +0200
-@@ -25,7 +25,7 @@
- \fBfsck.fat\fR \- check and repair MS\-DOS filesystems
- 
- .SH SYNOPSIS
--\fBfsck.fat\fR|\fBfsck.msdos\fR|\fBfsck.vfat\fR [\-aAflnrtvVwy] [\-d \fIPATH\fR \-d\ \fI...\fR] [\-u\ \fIPATH\fR \-u \fI...\fR] \fIDEVICE\fR
-+\fBfsck.fat\fR|\fBfsck.msdos\fR|\fBfsck.vfat\fR [\-aAflnprtvVwy] [\-d \fIPATH\fR \-d\ \fI...\fR] [\-u\ \fIPATH\fR \-u \fI...\fR] \fIDEVICE\fR
- 
- .SH DESCRIPTION
- \fBfsck.fat\fR verifies the consistency of MS\-DOS filesystems and optionally tries to repair them.
-@@ -90,6 +90,8 @@ List path names of files being processed
- .IP "\fB\-n\fR" 4
- No\-operation mode: non\-interactively check for errors, but don't write
- anything to the filesystem.
-+.IP "\fB\-p\fR" 4
-+Same as (\fB\-a\fR), for compatibility with other *fsck.
- .IP "\fB\-r\fR" 4
- Interactively repair the filesystem. The user is asked for advice whenever
- there is more than one approach to fix an inconsistency.
diff --git a/dosfstools.spec b/dosfstools.spec
index df7a2e3..880b5d8 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,13 +1,11 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 3.0.20
-Release: 3%{?dist}
+Version: 3.0.21
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.xz
 URL: http://www.daniel-baumann.ch/software/dosfstools/
-# Sent upstream
-Patch0: dosfstools-3.0.20-manpage-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,7 +15,6 @@ drives or on floppies.
 
 %prep
 %setup -q
-%patch0 -p1 -b .manpage-fix
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
@@ -36,6 +33,11 @@ rm -rf %{buildroot}
 %{_mandir}/*
 
 %changelog
+* Wed Jul 17 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.21-1
+- New version
+  Resolves: rhbz#985279
+- Dropped manpage-fix patch (upstreamed)
+
 * Tue Jun 25 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.20-3
 - Fixed fsck.vfat manpage to be consistent with the tool options
 
diff --git a/sources b/sources
index 8615bf2..c499b4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b34dcf1d22bc1074ebdba68799fa3cad  dosfstools-3.0.20.tar.xz
+b7841471dd7f3594cc53c908b70ff7da  dosfstools-3.0.21.tar.xz