- Up to 4.0.15

- Removed paths patch applied upstream
- Updated configure patch

Changed files:
    mtools-no_libnsl_and_libbsd.patch -> 1.2
    mtools-paths.patch -> 1.4
    mtools.spec -> 1.74

diff --git a/mtools-no_libnsl_and_libbsd.patch b/mtools-no_libnsl_and_libbsd.patch
index 45505c7c522607aba4e8d9981e2a2d90e8bb4547..480e47a4c3e01a5a4fa16b9a01231f8817f2525e 100644 (file)
--- a/mtools-no_libnsl_and_libbsd.patch
+++ b/mtools-no_libnsl_and_libbsd.patch
@@ -1,12 +1,11 @@
-diff -Nru mtools-3.9.7/configure.in mtools-3.9.7.new/configure.in
---- mtools-3.9.7/configure.in  Mon Feb 19 19:48:26 2001
-+++ mtools-3.9.7.new/configure.in      Mon Feb 19 19:49:11 2001
-@@ -338,8 +338,6 @@
+--- mtools-4.0.15/configure.in~        2010-10-17 18:39:15.000000000 +0300
++++ mtools-4.0.15/configure.in 2010-10-22 12:43:56.016683630 +0300
+@@ -357,8 +357,6 @@
  fi])
  
  AC_CHECK_LIB(socket,main)
--AC_CHECK_LIB(nsl,main)
+-dnl AC_CHECK_LIB(nsl,main)
 -AC_CHECK_LIB(bsd,main)
  AC_CHECK_HEADERS(sys/socket.h arpa/inet.h netdb.h)
  
- if test $use_floppyd = undef -a X$no_x = X ; then
+ if test X$use_floppyd = X -a X$no_x = X ; then

diff --git a/mtools-paths.patch b/mtools-paths.patch
deleted file mode 100644 (file)
index 5156167..0000000
--- a/mtools-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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 @@
- .SH Description
- .PP
- 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
- as the filename for a third configuration file. These configuration
- files describe the following items:
-@@ -35,7 +35,7 @@ files describe the following items:
- .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
-@@ -456,7 +456,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
--\&\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\ 
-@@ -465,7 +465,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
--\&\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.
-@@ -590,7 +590,7 @@ The configuration files are parsed in th
- 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
-@@ -608,10 +608,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 \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.

diff --git a/mtools.spec b/mtools.spec
index 61210d867878e1518c53f6d938ff5c61e3d320b4..5970f443761ce9912a4a1517be1f9773aeaedd27 100644 (file)
--- a/mtools.spec
+++ b/mtools.spec
@@ -6,17 +6,16 @@ Summary(pl.UTF-8):    Dostęp do dysków DOS-a bez montowania
 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.13
+Version:       4.0.15
 Release:       1
 License:       GPL v3+
 Group:         Applications/File
 #Source0Download: http://mtools.linux.lu/download.html
-Source0:       ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.bz2
-# Source0-md5: 334fe1580d6e3f4b5c904ce097267477
+Source0:       http://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2
+# Source0-md5: b7550b649af77812cb696a780e853f47
 Source1:       %{name}.conf
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5: 7af7d462db97b53e4bfdc4aa1e41b516
-Patch0:                %{name}-paths.patch
 Patch1:                %{name}-no_libnsl_and_libbsd.patch
 Patch2:                %{name}-pmake.patch
 URL:           http://www.gnu.org/software/mtools/
@@ -89,7 +88,6 @@ Daemon para acesso remoto a um drive de disquete.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -97,7 +95,6 @@ Daemon para acesso remoto a um drive de disquete.
 cp /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
-       --sysconfdir=%{_sysconfdir} \
        --enable-floppyd
 
 %{__make} \