- updated to 5.09

- removed obsolete fusecompress,dbase patches
- restored magic.mime generation (lost in rev. 1.188)
- improved magic.mime generator

Changed files:
    file-dbase.patch -> 1.2
    file-fusecompress.patch -> 1.3
    file-magic.mime-gen.awk -> 1.2
    file.spec -> 1.189

diff --git a/file-dbase.patch b/file-dbase.patch
deleted file mode 100644 (file)
index fee8669..0000000
--- a/file-dbase.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Single 0x03/0x83 is too weak (the first conflicts with Python 2.7);
-rely on the fact, that third byte is the last modification month in BCD, i.e. <= 0x12
---- file-5.04/magic/Magdir/msdos.orig  2010-08-25 08:34:47.942823295 +0200
-+++ file-5.04/magic/Magdir/msdos       2010-08-25 09:04:06.554822457 +0200
-@@ -549,12 +549,14 @@
- 0     lelong          0x08084b50      TurboC Font file
- 
- # WARNING: below line conflicts with Infocom game data Z-machine 3
--0     byte            0x03            DBase 3 data file
-->0x04 lelong          0               (no records)
-->0x04 lelong          >0              (%ld records)
--0     byte            0x83            DBase 3 data file with memo(s)
-->0x04 lelong          0               (no records)
-->0x04 lelong          >0              (%ld records)
-+0     byte            0x03
-+>0x02 byte            <0x13           DBase 3 data file
-+>>0x04        lelong          0               (no records)
-+>>0x04        lelong          >0              (%ld records)
-+0     byte            0x83
-+>0x02 byte            <0x13           DBase 3 data file with memo(s)
-+>>0x04        lelong          0               (no records)
-+>>0x04        lelong          >0              (%ld records)
- 0     leshort         0x0006          DBase 3 index file
- 0     string          PMCC            Windows 3.x .GRP file
- 1     string          RDC-meg         MegaDots 

diff --git a/file-fusecompress.patch b/file-fusecompress.patch
deleted file mode 100644 (file)
index 12be3d6..0000000
--- a/file-fusecompress.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN file-4.23.org/magic/Magdir/fusecompress file-4.23/magic/Magdir/fusecompress
---- file-4.23.org/magic/Magdir/fusecompress    1970-01-01 01:00:00.000000000 +0100
-+++ file-4.23/magic/Magdir/fusecompress        2008-04-06 14:26:04.688572986 +0200
-@@ -0,0 +1,8 @@
-+0     string  \037\135\211    FuseCompress(ed) data
-+>3    byte    0x00    (none format)
-+>3    byte    0x01    (bz2 format)
-+>3    byte    0x02    (gz format)
-+>3    byte    0x03    (lzo format)
-+>3    byte    0x04    (xor format)
-+>3    byte    >0x04   (unknown format)
-+>4    long    x       uncompressed size: %d
---- file-4.24/magic/Makefile.am~       2008-04-23 23:49:51.000000000 +0300
-+++ file-4.24/magic/Makefile.am        2008-04-23 23:50:10.685223161 +0300
-@@ -67,6 +67,7 @@
- $(MAGIC_FRAGMENT_DIR)/frame \
- $(MAGIC_FRAGMENT_DIR)/freebsd \
- $(MAGIC_FRAGMENT_DIR)/fsav \
-+$(MAGIC_FRAGMENT_DIR)/fusecompress \
- $(MAGIC_FRAGMENT_DIR)/games \
- $(MAGIC_FRAGMENT_DIR)/gcc \
- $(MAGIC_FRAGMENT_DIR)/geos \

diff --git a/file-magic.mime-gen.awk b/file-magic.mime-gen.awk
index 1c9ad401ce0a3cf369218cb98816547d30072521..7c74825183d7447a917244ddd4629a87d8d94b7c 100644 (file)
--- a/file-magic.mime-gen.awk
+++ b/file-magic.mime-gen.awk
@@ -15,7 +15,8 @@ BEGIN {
 }
 
 /^!: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]
 }

diff --git a/file.spec b/file.spec
index 5ccf5dee2f9ffb1da51f9a56728c21260042c5d1..84409d57cab5a33ba425009b0d644581200c87f5 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -28,12 +28,12 @@ Summary(uk.UTF-8):  Утиліта для визначення типів фай
 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
@@ -41,13 +41,11 @@ Source3:    %{name}-mscompress.magic
 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
@@ -249,11 +247,9 @@ Wiązania Pythona dla libmagic.
 %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
@@ -306,6 +302,7 @@ cd ..
 %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}