packages: mtools/mtools-paths.patch, mtools/mtools.spec - Up to 4.0.13 - Up...

Mon Jun 7 16:31:19 CEST 2010

Author: caleb                        Date: Mon Jun  7 14:31:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 4.0.13
- Updated paths patch, sysconfdir fixed upstream

---- Files affected:
packages/mtools:
   mtools-paths.patch (1.2 -> 1.3) , mtools.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: packages/mtools/mtools-paths.patch
diff -u packages/mtools/mtools-paths.patch:1.2 packages/mtools/mtools-paths.patch:1.3

--- packages/mtools/mtools-paths.patch:1.2	Sun Mar 15 18:50:29 2009
+++ packages/mtools/mtools-paths.patch	Mon Jun  7 16:31:13 2010
@@ -1,78 +1,9 @@
---- mtools-4.0.10/mtools.texi.orig	2009-03-10 08:02:49.000000000 +0100
-+++ mtools-4.0.10/mtools.texi	2009-03-15 18:26:49.000000000 +0100
-@@ -579,7 +579,7 @@ This manpage describes the configuration
-  This sections explains the syntax of the configurations files for
- mtools. The configuration files
- @comment 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:
-@@ -607,7 +607,7 @@ files describe the following items:
- @cindex Name of configuration files
- @cindex Location of configuration files
- 
-- at file{/usr/local/etc/mtools.conf} is the system-wide configuration file,
-+ at 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
-@@ -1020,7 +1020,7 @@ implied, unless explicitly disabled by @
- 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
-- at file{/usr/local/etc/mtools.conf}, and not for those described in
-+ at file{/etc/mtools.conf}, and not for those described in
- @file{~/.mtoolsrc} or @file{$MTOOLSRC}.  
- 
- @item privileged
-@@ -1029,7 +1029,7 @@ drives described in a system-wide config
- 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
-- at file{/usr/local/etc/mtools.conf}, not @file{~/.mtoolsrc} or
-+ at 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.
-@@ -1140,7 +1140,7 @@ The configuration files are parsed in th
- @item
- compiled-in defaults
- @item
-- at file{/usr/local/etc/mtools.conf}
-+ at file{/etc/mtools.conf}
- @item
- @file{/etc/mtools}
- This is for backwards compatibility only, and is only parsed if
-@@ -1156,10 +1156,10 @@ variable)
- 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.
-@@ -2512,7 +2512,7 @@ images (which may represent a partitione
- 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
 --- mtools-4.0.10/mtools.5.orig	2009-03-10 19:42:34.000000000 +0100
 +++ mtools-4.0.10/mtools.5	2009-03-15 18:25:14.000000000 +0100
-@@ -20,7 +20,7 @@ mtools.conf - mtools configuration files
+@@ -20,7 +20,7 @@
  .SH Description
  .PP
- This manpage describes the configuration files for mtools. They 
+ This manual page 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

================================================================
Index: packages/mtools/mtools.spec
diff -u packages/mtools/mtools.spec:1.71 packages/mtools/mtools.spec:1.72
--- packages/mtools/mtools.spec:1.71	Sun Nov  8 16:34:19 2009
+++ packages/mtools/mtools.spec	Mon Jun  7 16:31:14 2010
@@ -7,13 +7,13 @@
 Summary(pt_BR.UTF-8):	Programas para acessar discos DOS sem montá-los
 Summary(tr.UTF-8):	Bağlama (mount) yapmadan DOS disklerine erişim sağlar
 Name:		mtools
-Version:	4.0.12
+Version:	4.0.13
 Release:	1
 License:	GPL
 Group:		Applications/File
 #Source0Download: http://mtools.linux.lu/download.html
 Source0:	ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.bz2
-# Source0-md5:	0ee77a14e5f113ad8136a867f8ed4c3a
+# Source0-md5:	334fe1580d6e3f4b5c904ce097267477
 Source1:	%{name}.conf
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5:	7af7d462db97b53e4bfdc4aa1e41b516
@@ -97,11 +97,16 @@
 %build
 cp /usr/share/automake/config.sub .
 %{__autoconf}
-%configure
+%configure \
+	--sysconfdir=%{_sysconfdir} \
+	--enable-floppyd
 
 %{__make} \
 	MYCFLAGS="%{rpmcflags} -Wall"
 
+%{__make} \
+	sysconfdir.texi
+
 makeinfo --force mtools.texi
 touch mtools.*
 
@@ -158,6 +163,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2010/06/07 14:31:14  caleb
+- Up to 4.0.13
+- Updated paths patch, sysconfdir fixed upstream
+
 Revision 1.71  2009/11/08 15:34:19  adamg
 - updated to 4.0.12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mtools/mtools-paths.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mtools/mtools.spec?r1=1.71&r2=1.72&f=u

