- updated to 4.0.9

- merged mtools-3.9.7-bigdisk.patch to config patch
- mtools400-rh480112.patch merged to upstream

mtools-3.9.6-config.patch

@@ -1,6 +1,8 @@
---- mtools-3.9.6/mtools.conf.fixes	Sun Jan  4 04:29:32 1998
+diff -up mtools-4.0.9/mtools.conf.conf mtools-4.0.9/mtools.conf
-+++ mtools-3.9.6/mtools.conf	Wed Feb  9 11:41:36 2000
+--- mtools-4.0.9/mtools.conf.conf	2009-03-01 00:01:03.000000000 +0100
-@@ -1,22 +1,25 @@
++++ mtools-4.0.9/mtools.conf	2009-03-09 18:21:40.000000000 +0100
+@@ -16,11 +16,10 @@
+ 
  # Example mtools.conf files.  Uncomment the lines which correspond to
  # your architecture and comment out the "SAMPLE FILE" line below
 -SAMPLE FILE
@@ -9,30 +11,8 @@
 -# drive a: file="/dev/fd0" exclusive
 -# drive b: file="/dev/fd1" exclusive
 +# Linux floppy drives
-+drive a: file="/dev/fd0" exclusive 1.44m mformat_only
++drive a: file="/dev/fd0" exclusive mformat_only
-+drive b: file="/dev/fd1" exclusive 1.44m mformat_only
++drive b: file="/dev/fd1" exclusive mformat_only
  
--# # First SCSI hard disk partition
+ # # First SCSI hard disk partition
--# drive c: file="/dev/sda1"
+ # drive c: file="/dev/sda1"
-+# First SCSI hard disk partition
-+#drive c: file="/dev/sda1"
- 
--# # First IDE hard disk partition
--# drive c: file="/dev/hda1"
-+# First IDE hard disk partition
-+#drive c: file="/dev/hda1"
- 
- # # dosemu floppy image
- # drive m: file="/var/lib/dosemu/diskimage"
- 
--# # dosemu hdimage
--# drive n: file="/var/lib/dosemu/diskimage" offset=3840
-+# dosemu hdimage
-+drive n: file="/var/lib/dosemu/hdimage" offset=8832
-+
-+# # HPOJ (ptal-photod)
-+mtools_skip_check=1
-+drive p: file=":0" remote
- 
- # # Atari ramdisk image
- # drive o: file="/tmp/atari_rd" offset=136

mtools-3.9.7-bigdisk.patch

@@ -1,13 +0,0 @@
---- mtools-3.9.7/mtools.conf.big	Wed May 16 19:07:57 2001
-+++ mtools-3.9.7/mtools.conf	Wed May 16 19:08:12 2001
-@@ -2,8 +2,8 @@
- # your architecture and comment out the "SAMPLE FILE" line below
- 
- # Linux floppy drives
--drive a: file="/dev/fd0" exclusive 1.44m mformat_only
--drive b: file="/dev/fd1" exclusive 1.44m mformat_only
-+drive a: file="/dev/fd0" exclusive mformat_only
-+drive b: file="/dev/fd1" exclusive mformat_only
- 
- # First SCSI hard disk partition
- #drive c: file="/dev/sda1"

mtools.spec

@@ -1,15 +1,13 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
-Version: 4.0.0
+Version: 4.0.9
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
 Url: http://mtools.linux.lu/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: mtools-3.9.6-config.patch
-Patch3: mtools-3.9.7-bigdisk.patch
-Patch4: mtools400-rh480112.patch
 Requires: info
 
 BuildRequires: texinfo, autoconf
@@ -24,9 +22,7 @@ Mtools should be installed if you need to use MS-DOS disks
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%patch0 -p1 -b .conf
-%patch3 -p1 -b .big
-%patch4 -p1 -b .rh480112
 
 # Correct system paths
 for all in mtools.5 mtools.texi; do
@@ -65,12 +61,17 @@ fi
 %files
 %defattr(-,root,root)
 %config(noreplace) /etc/mtools.conf
-%doc COPYING Changelog README Release.notes
+%doc COPYING README Release.notes
 /usr/bin/*
 %{_mandir}/*/*
 %{_infodir}/%{name}.info.gz
 
 %changelog
+* Mon Mar 09 2009 Adam Tkac <atkac redhat com> 4.0.9-1
+- updated to 4.0.9
+- merged mtools-3.9.7-bigdisk.patch to config patch
+- mtools400-rh480112.patch merged to upstream
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

mtools400-rh480112.patch

@@ -1,12 +0,0 @@
-diff -up mtools-4.0.0/file_name.c.rh480112 mtools-4.0.0/file_name.c
---- mtools-4.0.0/file_name.c.rh480112	2009-01-21 19:35:08.000000000 +0100
-+++ mtools-4.0.0/file_name.c	2009-01-21 19:35:36.000000000 +0100
-@@ -145,7 +145,7 @@ void dos_name(doscp_t *toDos, const char
- wchar_t *unix_name(doscp_t *dosCp,
- 		   const char *base, const char *ext, char Case, wchar_t *ret)
- {
--	char *s, tname[9], text[4], ans[11];
-+	char *s, tname[9], text[4], ans[13];
- 	int i;
- 
- 	strncpy(tname, base, 8);