Author: qboosh Date: Wed Aug 25 07:14:53 2010 GMT Module: packages Tag: HEAD ---- Log message: - removed obsolete lzma patch - added python patch (recognize python 2.7) - added dbase patch (workaround too weak DBase 3 entries, which covered python 2.7) - release 0.2
---- Files affected: packages/file: file.spec (1.171 -> 1.172) , file-dbase.patch (NONE -> 1.1) (NEW), file-python.patch (NONE -> 1.1) (NEW), file-lzma.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/file/file.spec diff -u packages/file/file.spec:1.171 packages/file/file.spec:1.172 --- packages/file/file.spec:1.171 Wed Aug 25 08:49:09 2010 +++ packages/file/file.spec Wed Aug 25 09:14:47 2010 @@ -30,7 +30,7 @@ Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。 Name: file Version: 5.04 -Release: 0.1 +Release: 0.2 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz @@ -47,7 +47,8 @@ Patch4: %{name}-selinux.patch Patch5: %{name}-msdos.patch Patch6: %{name}-fusecompress.patch -Patch7: %{name}-lzma.patch +Patch7: %{name}-python.patch +Patch8: %{name}-dbase.patch URL: http://www.darwinsys.com/file/ BuildRequires: autoconf BuildRequires: automake @@ -256,6 +257,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 rm -f magic/Magdir/{*.orig,*~} @@ -388,6 +390,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.172 2010/08/25 07:14:47 qboosh +- removed obsolete lzma patch +- added python patch (recognize python 2.7) +- added dbase patch (workaround too weak DBase 3 entries, which covered python 2.7) +- release 0.2 + Revision 1.171 2010/08/25 06:49:09 qboosh - updated to 5.04 - updated debian patch (from 5_04-5) ================================================================ Index: packages/file/file-dbase.patch diff -u /dev/null packages/file/file-dbase.patch:1.1 --- /dev/null Wed Aug 25 09:14:53 2010 +++ packages/file/file-dbase.patch Wed Aug 25 09:14:47 2010 @@ -0,0 +1,25 @@ +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 ================================================================ Index: packages/file/file-python.patch diff -u /dev/null packages/file/file-python.patch:1.1 --- /dev/null Wed Aug 25 09:14:53 2010 +++ packages/file/file-python.patch Wed Aug 25 09:14:47 2010 @@ -0,0 +1,10 @@ +--- file-5.04/magic/Magdir/python.orig 2009-10-27 15:49:57.000000000 +0100 ++++ file-5.04/magic/Magdir/python 2010-08-25 08:48:48.722825810 +0200 +@@ -17,6 +17,7 @@ + 0 belong 0x6df20d0a python 2.4 byte-compiled + 0 belong 0xb3f20d0a python 2.5 byte-compiled + 0 belong 0xd1f20d0a python 2.6 byte-compiled ++0 belong 0x03f30d0a python 2.7 byte-compiled + 0 belong 0x3b0c0d0a python 3.0 byte-compiled + 0 belong 0x4f0c0d0a python 3.1 byte-compiled + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file.spec?r1=1.171&r2=1.172&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
