packages: file/file-magic.mime-gen.awk, file/file.spec, file/file-dbase.pat...

[qboosh]

Author: qboosh                       Date: Tue Sep 20 16:13:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 5.09
- removed obsolete fusecompress,dbase patches
- restored magic.mime generation (lost in rev. 1.188)
- improved magic.mime generator

---- Files affected:
packages/file:
   file-magic.mime-gen.awk (1.1 -> 1.2) , file.spec (1.188 -> 1.189) , file-dbase.patch (1.1 -> NONE)  (REMOVED), file-fusecompress.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/file/file-magic.mime-gen.awk
diff -u packages/file/file-magic.mime-gen.awk:1.1 packages/file/file-magic.mime-gen.awk:1.2
--- packages/file/file-magic.mime-gen.awk:1.1	Sun Jul 20 00:54:39 2008
+++ packages/file/file-magic.mime-gen.awk	Tue Sep 20 18:13:21 2011
@@ -15,7 +15,8 @@
 }
 
 /^!:mime/ {
+	split($0, m, "[\t ]+")
 	for(i = 0; i < level; i++)
 		print str[i]
-	print str[level]"\t"$2
+	print str[level]"\t"m[2]
 }

================================================================
Index: packages/file/file.spec
diff -u packages/file/file.spec:1.188 packages/file/file.spec:1.189
--- packages/file/file.spec:1.188	Sun Aug  7 16:01:15 2011
+++ packages/file/file.spec	Tue Sep 20 18:13:21 2011
@@ -29,12 +29,12 @@
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.08
+Version:	5.09
 Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	6a2a263c20278f01fe3bb0f720b27d4e
+# Source0-md5:	6fd7cd6c4281e68fe9ec6644ce0fac6f
 Source1:	http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:	%{name}-zisofs.magic
@@ -42,13 +42,11 @@
 Source4:	%{name}-magic.mime-gen.awk
 #Patch0:		git.patch
 Patch1:		%{name}-sparc.patch
-Patch4:		%{name}-selinux.patch
-Patch6:		%{name}-fusecompress.patch
-Patch8:		%{name}-dbase.patch
-Patch9:		searchpath.patch
-Patch10:	automake.patch
+Patch2:		%{name}-selinux.patch
+Patch3:		searchpath.patch
+Patch4:		automake.patch
 URL:		http://www.darwinsys.com/file/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	rpmbuild(macros) >= 1.453
@@ -250,11 +248,9 @@
 %setup -q
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -307,6 +303,7 @@
 %py_postclean
 %endif
 
+awk -f %{SOURCE4} < $RPM_BUILD_ROOT%{_datadir}/misc/magic > $RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
 ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -384,6 +381,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2011/09/20 16:13:21  qboosh
+- updated to 5.09
+- removed obsolete fusecompress,dbase patches
+- restored magic.mime generation (lost in rev. 1.188)
+- improved magic.mime generator
+
 Revision 1.188  2011/08/07 14:01:15  glen
 - handle extra addons via file own makefiles
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file-magic.mime-gen.awk?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file.spec?r1=1.188&r2=1.189&f=u