SPECS: mtools.spec - added official patchset 20060626 - removed DE...

[tommat]

Author: tommat                       Date: Thu Nov 16 18:09:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added official patchset 20060626
- removed DESTDIR patch - outdated
- packaged amuFormat.sh
- renumerated patches

---- Files affected:
SPECS:
   mtools.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/mtools.spec
diff -u SPECS/mtools.spec:1.60 SPECS/mtools.spec:1.61
--- SPECS/mtools.spec:1.60	Wed Nov 15 18:39:46 2006
+++ SPECS/mtools.spec	Thu Nov 16 19:09:49 2006
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%define _snap	20060626
 Summary:	Programs to access DOS disks w/o mounting them
 Summary(de):	Programme für den Zugriff auf DOS-Disks, ohne sie zu montieren
 Summary(es):	Programas para acceder discos DOS sin montarlos
@@ -8,7 +9,7 @@
 Summary(tr):	Bađlama (mount) yapmadan DOS disklerine eriţim sađlar
 Name:		mtools
 Version:	3.9.10
-Release:	1
+Release:	1.%{_snap}.1
 License:	GPL
 Group:		Applications/File
 Source0:	http://mtools.linux.lu/%{name}-%{version}.tar.bz2
@@ -16,11 +17,12 @@
 Source1:	%{name}.conf
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5:	7af7d462db97b53e4bfdc4aa1e41b516
+Source3:	http://mtools.linux.lu/%{name}-%{version}-%{_snap}.diff.gz
+# Source3-md5:	346a58a582110339a573231189d51251
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-DESTDIR.patch
-Patch2:		%{name}-paths.patch
-Patch3:		%{name}-no_libnsl_and_libbsd.patch
-Patch4:		%{name}-pmake.patch
+Patch1:		%{name}-paths.patch
+Patch2:		%{name}-no_libnsl_and_libbsd.patch
+Patch3:		%{name}-pmake.patch
 URL:		http://mtools.linux.lu/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -91,18 +93,18 @@
 
 %prep
 %setup -q
+gunzip -c %{SOURCE3} | patch -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 cp /usr/share/automake/config.sub .
 %{__autoconf}
 %configure
 
-%{__make} all floppyd \
+%{__make} \
 	MYCFLAGS="%{rpmcflags} -Wall"
 
 makeinfo --force mtools.texi
@@ -118,7 +120,8 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
-bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+tar -xjf %{SOURCE2} -C $RPM_BUILD_ROOT%{_mandir}
+rm -f $RPM_BUILD_ROOT%{_mandir}/README.mtools-non-english-man-pages.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,6 +135,7 @@
 %files
 %defattr(644,root,root,755)
 %doc Changelog README Release.notes
+%attr(755,root,root) %{_bindir}/amuFormat.sh
 %attr(755,root,root) %{_bindir}/m*
 %attr(755,root,root) %{_bindir}/tgz
 %attr(755,root,root) %{_bindir}/uz
@@ -156,6 +160,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2006/11/16 18:09:49  tommat
+- added official patchset 20060626
+- removed DESTDIR patch - outdated
+- packaged amuFormat.sh
+- renumerated patches
+
 Revision 1.60  2006/11/15 17:39:46  tommat
 - force building od floppyd
 - missing BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mtools.spec?r1=1.60&r2=1.61&f=u