From 887aa47fa2e1626ac1d7f69123de4df187ad989e Mon Sep 17 00:00:00 2001
From: Štěpán Kasal <kasal@fedoraproject.org>
Date: Jan 30 2009 13:50:37 +0000
Subject: - fix the previous commit

- omit the most obsolete documents
- after writing the label, exit with exit code 0 (#468050)

---

diff --git a/dosfstools-exit.patch b/dosfstools-exit.patch
new file mode 100644
index 0000000..f9e7f81
--- /dev/null
+++ b/dosfstools-exit.patch
@@ -0,0 +1,16 @@
+2009-01-30  Stepan Kasal  <skasal@redhat.com>
+
+	* src/dosfslabel.c (main): After writing the label, exit code
+	should be 0.
+
+diff -up dosfstools-3.0.1/src/dosfslabel.c.exit dosfstools-3.0.1/src/dosfslabel.c
+--- dosfstools-3.0.1/src/dosfslabel.c.exit	2008-09-28 12:06:37.000000000 +0200
++++ dosfstools-3.0.1/src/dosfslabel.c	2009-01-30 14:28:47.000000000 +0100
+@@ -122,5 +122,6 @@ int main(int argc, char *argv[])
+     }
+ 
+     write_label(&fs, label);
+-    return fs_close(rw) ? 1 : 0;
++    fs_close(rw);
++    return 0;
+ }
diff --git a/dosfstools-install-p.patch b/dosfstools-install-p.patch
new file mode 100644
index 0000000..8488c3f
--- /dev/null
+++ b/dosfstools-install-p.patch
@@ -0,0 +1,20 @@
+2009-01-30  Stepan Kasal  <skasal@redhat.com>
+
+	* Makefile: Do not clobber time stamps of doc files.
+
+--- dosfstools-3.0.1/Makefile.p	2008-09-28 12:06:37.000000000 +0200
++++ dosfstools-3.0.1/Makefile	2009-01-30 12:25:59.000000000 +0100
+@@ -58,11 +58,11 @@
+ 
+ install-doc:
+ 	install -d -m 0755 $(DESTDIR)/$(DOCDIR)/dosfstools
+-	install -m 0644 doc/* $(DESTDIR)/$(DOCDIR)/dosfstools
++	install -p -m 0644 doc/* $(DESTDIR)/$(DOCDIR)/dosfstools
+ 
+ install-man:
+ 	install -d -m 0755 $(DESTDIR)/$(MANDIR)/man8
+-	install -m 0644 man/*.8 $(DESTDIR)/$(MANDIR)/man8
++	install -p -m 0644 man/*.8 $(DESTDIR)/$(MANDIR)/man8
+ 
+ 	ln -sf dosfsck.8 $(DESTDIR)/$(MANDIR)/man8/fsck.msdos.8
+ 	ln -sf dosfsck.8 $(DESTDIR)/$(MANDIR)/man8/fsck.vfat.8
diff --git a/dosfstools.spec b/dosfstools.spec
index 4216fd9..d795c29 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.gz
@@ -10,6 +10,11 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: mkdosfs-ygg
 Provides: mkdosfs-ygg = %{version}
 
+# Mailed to Daniel Baumann
+Patch0: dosfstools-install-p.patch
+# Mailed to Daniel Baumann
+Patch1: dosfstools-exit.patch
+
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
 which respectively make and check MS-DOS FAT filesystems on hard
@@ -17,25 +22,31 @@ drives or on floppies.
 
 %prep
 %setup -q
-sed -i 's,\$(DOCDIR)/%{name}$,&-%{version},' Makefile
+%patch0 -p1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install PREFIX=%{_prefix} SBINDIR=/sbin
+make DESTDIR=%{buildroot} install-bin install-man PREFIX=%{_prefix} SBINDIR=/sbin
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING
+%doc ChangeLog COPYING doc/*-2.x
 /sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 30 2009 Stepan Kasal <skasal@redhat.com> - 3.0.1-3
+- fix the previous commit
+- omit the most obsolete documents
+- after writing the label, exit with exit code 0 (#468050)
+
 * Fri Jan 30 2009 Stepan Kasal <skasal@redhat.com> - 3.0.1-2
 - install all the documentation to the usual docdir (#225707)