rpms/dosfstools/devel dosfstools-exit.patch, NONE, 1.1 dosfstools-install-p.patch, NONE, 1.1 dosfstools.spec, 1.35, 1.36

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25287

Modified Files:
	dosfstools.spec 
Added Files:
	dosfstools-exit.patch dosfstools-install-p.patch 
Log Message:
- fix the previous commit
- omit the most obsolete documents
- after writing the label, exit with exit code 0 (#468050)

dosfstools-exit.patch:

--- NEW FILE dosfstools-exit.patch ---
2009-01-30  Stepan Kasal  <skasal at 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;
 }

dosfstools-install-p.patch:

--- NEW FILE dosfstools-install-p.patch ---
2009-01-30  Stepan Kasal  <skasal at 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


Index: dosfstools.spec
===================================================================
RCS file: /cvs/extras/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dosfstools.spec	30 Jan 2009 09:44:27 -0000	1.35
+++ dosfstools.spec	30 Jan 2009 13:50:37 -0000	1.36
@@ -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 @@
 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 @@
 
 %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 at 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 at redhat.com> - 3.0.1-2
 - install all the documentation to the usual docdir (#225707)