rpms/mtools/devel mtools.spec, 1.35, 1.36 mtools-3.9.6-paths.patch, 1.1, NONE mtools-3.9.9-noargs.patch, 1.1, NONE

[Adam Tkac]

Author: atkac

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

Modified Files:
	mtools.spec 
Removed Files:
	mtools-3.9.6-paths.patch mtools-3.9.9-noargs.patch 
Log Message:
- mtools-3.9.9-noargs.patch and mtools-3.9.6-paths.patch are not needed
- rebuild (#465040)



Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mtools.spec	19 Feb 2008 16:39:56 -0000	1.35
+++ mtools.spec	3 Oct 2008 10:42:30 -0000	1.36
@@ -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 @@
 %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 @@
 %{_infodir}/*
 
 %changelog
+* Fri Oct 03 2008 Adam Tkac <atkac redhat com> 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 <atkac redhat com> 3.9.11-4
 - fixed building on x86_64 (build with --disable-floppyd)
 


--- mtools-3.9.6-paths.patch DELETED ---


--- mtools-3.9.9-noargs.patch DELETED ---