SPECS (AC-branch): file.spec - up to 4.20 - merged with HEAD

[zawadaa]

Author: zawadaa                      Date: Tue Apr 17 07:31:50 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 4.20 - merged with HEAD

---- Files affected:
SPECS:
   file.spec (1.120.2.1 -> 1.120.2.2) 

---- Diffs:

================================================================
Index: SPECS/file.spec
diff -u SPECS/file.spec:1.120.2.1 SPECS/file.spec:1.120.2.2
--- SPECS/file.spec:1.120.2.1	Tue Dec  5 10:42:28 2006
+++ SPECS/file.spec	Tue Apr 17 09:31:45 2007
@@ -28,27 +28,23 @@
 Summary(zh_CN):	ĹĐś¨ÎÄźţŔŕĐ;̤žßĄŁ
 Summary(zh_TW):	ĽÎŠó¨MŠwŔÉŽ×ĂţŤŹŞş¤@­Ó¤u¨ăľ{ŚĄĄC
 Name:		file
-Version:	4.18
-Release:	4
+Version:	4.20
+Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	ce1aa9b0316feb57d40a48cfe6b606e4
+# Source0-md5:	402bdb26356791bd5d277099adacc006
 Source1:	zisofs.magic
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5:	c157a183b64156f8baafaefd9cbf04c1
 Source3:	%{name}-magic.mscompress
 Patch0:		%{name}-debian.patch
 Patch1:		%{name}-sparc.patch
-Patch2:		%{name}-unicode.patch
-Patch3:		%{name}-dicom.patch
-Patch4:		%{name}-lmagic.patch
-Patch5:		%{name}-greedy-dump.patch
-Patch6:		%{name}-magic.patch
-Patch7:		%{name}-selinux.patch
-Patch8:		%{name}-msdos.patch
-Patch9:		%{name}-python-2.5.patch
-Patch10:	%{name}-offset.patch
+Patch2:		%{name}-lmagic.patch
+Patch3:		%{name}-greedy-dump.patch
+Patch4:		%{name}-magic.patch
+Patch5:		%{name}-selinux.patch
+Patch6:		%{name}-msdos.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -255,10 +251,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 %{__libtoolize}
@@ -366,6 +358,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.2  2007/04/17 07:31:45  zawadaa
+- up to 4.20 - merged with HEAD
+
 Revision 1.120.2.1  2006/12/05 09:42:28  glen
 - HEAD merge; rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/file.spec?r1=1.120.2.1&r2=1.120.2.2&f=u