SPECS (AC-branch): file.spec - HEAD merge; rel 4

[glen]

Author: glen                         Date: Tue Dec  5 09:42:33 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge; rel 4

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

---- Diffs:

================================================================
Index: SPECS/file.spec
diff -u SPECS/file.spec:1.120 SPECS/file.spec:1.120.2.1
--- SPECS/file.spec:1.120	Mon Nov 13 17:56:53 2006
+++ SPECS/file.spec	Tue Dec  5 10:42:28 2006
@@ -29,7 +29,7 @@
 Summary(zh_TW):	ĽÎŠó¨MŠwŔÉŽ×ĂţŤŹŞş¤@­Ó¤u¨ăľ{ŚĄĄC
 Name:		file
 Version:	4.18
-Release:	1
+Release:	4
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
@@ -48,12 +48,13 @@
 Patch7:		%{name}-selinux.patch
 Patch8:		%{name}-msdos.patch
 Patch9:		%{name}-python-2.5.patch
+Patch10:	%{name}-offset.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 %if %{with python}
-BuildRequires:	python-devel >= 2.5
-BuildRequires:	python-modules >= 2.5
+BuildRequires:	python-devel >= 1:2.4
+BuildRequires:	python-modules >= 1:2.4
 BuildRequires:	rpm-pythonprov
 %endif
 Requires:	libmagic = %{version}-%{release}
@@ -257,6 +258,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %{__libtoolize}
@@ -364,6 +366,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.1  2006/12/05 09:42:28  glen
+- HEAD merge; rel 4
+
 Revision 1.120  2006/11/13 16:56:53  glen
 - check-files cleanup
 
================================================================

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