From 983431091e8a7b0d5f57f008ece46e365bfe011c Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 3 Oct 2008 10:42:30 +0000 Subject: [PATCH] - mtools-3.9.9-noargs.patch and mtools-3.9.6-paths.patch are not needed - rebuild (#465040) --- mtools-3.9.6-paths.patch | 129 -------------------------------------- mtools-3.9.9-noargs.patch | 15 ----- mtools.spec | 15 +++-- 3 files changed, 10 insertions(+), 149 deletions(-) delete mode 100644 mtools-3.9.6-paths.patch delete mode 100644 mtools-3.9.9-noargs.patch diff --git a/mtools-3.9.6-paths.patch b/mtools-3.9.6-paths.patch deleted file mode 100644 index f5986bb..0000000 --- a/mtools-3.9.6-paths.patch +++ /dev/null @@ -1,129 +0,0 @@ ---- mtools-3.9.6/mtools.5.paths Wed Feb 9 11:35:43 2000 -+++ mtools-3.9.6/mtools.5 Wed Feb 9 11:36:39 2000 -@@ -20,7 +20,7 @@ - .SS Description - .PP - This manpage describes the configuration files for mtools. They --are called \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If -+are called \fR\&\f(CW\(if/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If - the environmental variable \fR\&\f(CWMTOOLSRC\fR is set, its contents is used - as the filename for a third configuration file. These configuration - files describe the following items: -@@ -37,7 +37,7 @@ - .iX "c Name of configuration files" - .iX "c Location of configuration files" - .PP --\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR is the system-wide configuration file, -+\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR is the system-wide configuration file, - and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR is the user's private configuration file. - .PP - On some systems, the system-wide configuration file is called -@@ -444,7 +444,7 @@ - Mtools uses its root privileges to open the device, and to issue the - actual SCSI I/O calls. Moreover, root privileges are only used for - drives described in a system-wide configuration file such as --\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR, and not for those described in -+\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR, and not for those described in - \&\fR\&\f(CW\(if~/.mtoolsrc\(is\fR or \fR\&\f(CW\(if$MTOOLSRC\(is\fR. - .TP - \&\fR\&\f(CWprivileged\fR\ -@@ -453,7 +453,7 @@ - When set to 1, this instructs mtools to use its set-uid and set-gid - privileges for opening the given drive. This option is only valid for - drives described in the system-wide configuration files (such as --\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR, not \fR\&\f(CW\(if~/.mtoolsrc\(is\fR or -+\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR, not \fR\&\f(CW\(if~/.mtoolsrc\(is\fR or - \&\fR\&\f(CW\(if$MTOOLSRC\(is\fR). Obviously, this option is also a no op if mtools is - not installed setuid or setgid. This option is implied by 'scsi=1', but - again only for drives defined in system-wide configuration files. -@@ -743,7 +743,7 @@ - compiled-in defaults - .TP - 2.\ --\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR -+\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR - .TP - 3.\ - \&\fR\&\f(CW\(if/etc/mtools\(is\fR -@@ -761,10 +761,10 @@ - Options described in the later files override those described in the - earlier files. Drives defined in earlier files persist if they are not - overridden in the later files. For instance, drives A and B may be --defined in \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR and drives C and D may be -+defined in \fR\&\f(CW\(if/etc/mtools.conf\(is\fR and drives C and D may be - defined in \fR\&\f(CW\(if~/.mtoolsrc\(is\fR However, if \fR\&\f(CW\(if~/.mtoolsrc\(is\fR also - defines drive A, this new description would override the description of --drive A in \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR instead of adding to it. If -+drive A in \fR\&\f(CW\(if/etc/mtools.conf\(is\fR instead of adding to it. If - you want to add a new description to a drive already described in an - earlier file, you need to use either the \fR\&\f(CW+drive\fR or \fR\&\f(CWdrive+\fR - keyword. ---- mtools-3.9.6/mtools.texi.paths Wed Feb 9 11:38:24 2000 -+++ mtools-3.9.6/mtools.texi Wed Feb 9 11:39:03 2000 -@@ -616,7 +616,7 @@ - This sections explains the syntax of the configurations files for - mtools. The configuration files - @c MANend-skip 5 --are called @file{/usr/local/etc/mtools.conf} and @file{~/.mtoolsrc}. If -+are called @file{/etc/mtools.conf} and @file{~/.mtoolsrc}. If - the environmental variable @code{MTOOLSRC} is set, its contents is used - as the filename for a third configuration file. These configuration - files describe the following items: -@@ -646,7 +646,7 @@ - @cindex Name of configuration files - @cindex Location of configuration files - --@file{/usr/local/etc/mtools.conf} is the system-wide configuration file, -+@file{/etc/mtools.conf} is the system-wide configuration file, - and @file{~/.mtoolsrc} is the user's private configuration file. - - On some systems, the system-wide configuration file is called -@@ -1043,7 +1043,7 @@ - Mtools uses its root privileges to open the device, and to issue the - actual SCSI I/O calls. Moreover, root privileges are only used for - drives described in a system-wide configuration file such as --@file{/usr/local/etc/mtools.conf}, and not for those described in -+@file{/etc/mtools.conf}, and not for those described in - @file{~/.mtoolsrc} or @file{$MTOOLSRC}. - - @item privileged -@@ -1052,7 +1052,7 @@ - When set to 1, this instructs mtools to use its set-uid and set-gid - privileges for opening the given drive. This option is only valid for - drives described in the system-wide configuration files (such as --@file{/usr/local/etc/mtools.conf}, not @file{~/.mtoolsrc} or -+@file{/etc/mtools.conf}, not @file{~/.mtoolsrc} or - @file{$MTOOLSRC}). Obviously, this option is also a no op if mtools is - not installed setuid or setgid. This option is implied by 'scsi=1', but - again only for drives defined in system-wide configuration files. -@@ -1332,7 +1332,7 @@ - @item - compiled-in defaults - @item --@file{/usr/local/etc/mtools.conf} -+@file{/etc/mtools.conf} - @item - @file{/etc/mtools} - This is for backwards compatibility only, and is only parsed if -@@ -1348,10 +1348,10 @@ - Options described in the later files override those described in the - earlier files. Drives defined in earlier files persist if they are not - overridden in the later files. For instance, drives A and B may be --defined in @file{/usr/local/etc/mtools.conf} and drives C and D may be -+defined in @file{/etc/mtools.conf} and drives C and D may be - defined in @file{~/.mtoolsrc} However, if @file{~/.mtoolsrc} also - defines drive A, this new description would override the description of --drive A in @file{/usr/local/etc/mtools.conf} instead of adding to it. If -+drive A in @file{/etc/mtools.conf} instead of adding to it. If - you want to add a new description to a drive already described in an - earlier file, you need to use either the @code{+drive} or @code{drive+} - keyword. -@@ -2614,7 +2614,7 @@ - same devices are found on a large number of hosts of this type. In that - case, could you also let me know about your new definitions, so that I - can include them into the next release. For purely local file, I --recommend that you use the @code{/usr/local/etc/mtools.conf} and -+recommend that you use the @code{/etc/mtools.conf} and - @code{~/.mtoolsrc} configuration files. - - However, the devices files also allows to supply geometry setting diff --git a/mtools-3.9.9-noargs.patch b/mtools-3.9.9-noargs.patch deleted file mode 100644 index c4c9176..0000000 --- a/mtools-3.9.9-noargs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mtools-3.9.9/scripts/mcomp.noargs 2003-05-22 12:22:42.000000000 +0100 -+++ mtools-3.9.9/scripts/mcomp 2003-05-22 13:09:05.000000000 +0100 -@@ -1,5 +1,12 @@ - #!/bin/sh - -+if [ $# -lt 2 ]; then -+ echo "usage: $0 [-bspanvmQT] [-D clash_option] sourcefile targetfile" -+ echo " $0 [-bspanvmQT] [-D clash_option] sourcefile [ sourcefiles... ]" -+ echo " targetdirectoryopy [-tnvm] MSDOSsourcefile" -+ exit 1 -+fi -+ - dosfile=$1 - shift - diff --git a/mtools.spec b/mtools.spec index 081f764..3b1107b 100644 --- a/mtools.spec +++ b/mtools.spec @@ -1,16 +1,14 @@ Summary: Programs for accessing MS-DOS disks without mounting the disks Name: mtools Version: 3.9.11 -Release: 4%{?dist} +Release: 5%{?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 -Patch1: mtools-3.9.6-paths.patch Patch3: mtools-3.9.7-bigdisk.patch -Patch4: mtools-3.9.9-noargs.patch Requires: info BuildRequires: texinfo, autoconf @@ -26,9 +24,12 @@ Mtools should be installed if you need to use MS-DOS disks %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 %patch3 -p1 -b .big -%patch4 -p1 -b .noargs + +# Correct system paths +for all in mtools.5 mtools.texi; do + sed -i.orig 's/\/usr\/local//' $all +done %build autoreconf -fiv @@ -65,6 +66,10 @@ fi %{_infodir}/* %changelog +* Fri Oct 03 2008 Adam Tkac 3.9.11-5 +- mtools-3.9.9-noargs.patch and mtools-3.9.6-paths.patch are not needed +- rebuild (#465040) + * Tue Feb 19 2008 Adam Tkac 3.9.11-4 - fixed building on x86_64 (build with --disable-floppyd)