- Fix build (bug #151135).

mtools-gcc4.patch

@@ -0,0 +1,15 @@
+--- mtools-3.9.9/stream.h.gcc4	2005-03-15 11:27:15.000000000 +0000
++++ mtools-3.9.9/stream.h	2005-03-15 11:27:37.000000000 +0000
+@@ -25,10 +25,10 @@
+ } Class_t;
+ 
+ #define READS(stream, buf, address, size) \
+-(stream)->Class->read( (stream), (char *) (buf), (address), (size) )
++((stream)->Class->read)( (stream), (char *) (buf), (address), (size) )
+ 
+ #define WRITES(stream, buf, address, size) \
+-(stream)->Class->write( (stream), (char *) (buf), (address), (size) )
++((stream)->Class->write)( (stream), (char *) (buf), (address), (size) )
+ 
+ #define SET_GEOM(stream, dev, orig_dev, media, boot) \
+ (stream)->Class->set_geom( (stream), (dev), (orig_dev), (media), (boot) )

mtools.spec

@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.9
-Release: 11
+Release: 12
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -9,6 +9,7 @@ Url: http://mtools.linux.lu/
 Buildroot: %{_tmppath}/mtools-%{version}-root
 Patch0: mtools-3.9.6-config.patch
 Patch1: mtools-3.9.6-paths.patch
+Patch2: mtools-gcc4.patch
 Patch3: mtools-3.9.7-bigdisk.patch
 Patch4: mtools-3.9.9-noargs.patch
 Patch5: mtools-3.9.9-badc.patch
@@ -28,6 +29,7 @@ Mtools should be installed if you need to use MS-DOS disks.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .gcc4
 %patch3 -p1 -b .big
 %patch4 -p1 -b .noargs
 %patch5 -p1 -b .badc
@@ -66,6 +68,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Tue Mar 15 2005 Tim Waugh <twaugh@redhat.com> 3.9.9-12
+- Fix build (bug #151135).
+
 * Wed Mar  2 2005 Tim Waugh <twaugh@redhat.com> 3.9.9-11
 - Rebuild for new GCC.