rpms/mtools/devel mtools-3.9.6-config.patch, 1.2, 1.3 mtools.spec, 1.42, 1.43 mtools-3.9.7-bigdisk.patch, 1.1, NONE mtools400-rh480112.patch, 1.1, NONE

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20520

Modified Files:
	mtools-3.9.6-config.patch mtools.spec 
Removed Files:
	mtools-3.9.7-bigdisk.patch mtools400-rh480112.patch 
Log Message:
- 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:

Index: mtools-3.9.6-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools-3.9.6-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mtools-3.9.6-config.patch	9 Sep 2004 08:50:30 -0000	1.2
+++ mtools-3.9.6-config.patch	9 Mar 2009 19:24:16 -0000	1.3
@@ -1,6 +1,8 @@
---- mtools-3.9.6/mtools.conf.fixes	Sun Jan  4 04:29:32 1998
-+++ mtools-3.9.6/mtools.conf	Wed Feb  9 11:41:36 2000
-@@ -1,22 +1,25 @@
+diff -up mtools-4.0.9/mtools.conf.conf mtools-4.0.9/mtools.conf
+--- mtools-4.0.9/mtools.conf.conf	2009-03-01 00:01:03.000000000 +0100
++++ 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 b: file="/dev/fd1" exclusive 1.44m mformat_only
- 
--# # First SCSI hard disk partition
--# 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
++drive a: file="/dev/fd0" exclusive mformat_only
++drive b: file="/dev/fd1" exclusive mformat_only
  
- # # Atari ramdisk image
- # drive o: file="/tmp/atari_rd" offset=136
+ # # First SCSI hard disk partition
+ # drive c: file="/dev/sda1"


Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mtools.spec	26 Feb 2009 03:13:33 -0000	1.42
+++ mtools.spec	9 Mar 2009 19:24:16 -0000	1.43
@@ -1,15 +1,13 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
-Version: 4.0.0
-Release: 4%{?dist}
+Version: 4.0.9
+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 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch3 -p1 -b .big
-%patch4 -p1 -b .rh480112
+%patch0 -p1 -b .conf
 
 # Correct system paths
 for all in mtools.5 mtools.texi; do
@@ -65,12 +61,17 @@
 %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 at lists.fedoraproject.org> - 4.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- mtools-3.9.7-bigdisk.patch DELETED ---


--- mtools400-rh480112.patch DELETED ---