diff --git a/file-5.02-zip2.0.dif b/file-5.02-zip2.0.dif new file mode 100644 index 0000000..36e57af --- /dev/null +++ b/file-5.02-zip2.0.dif @@ -0,0 +1,13 @@ +--- magic/Magdir/archive ++++ magic/Magdir/archive 2009-05-07 17:43:15.549950181 +0200 +@@ -575,6 +575,10 @@ + >4 byte 0x14 + >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract + !:mime application/zip ++>>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract ++>>>34 ubelong 0x74797065 \b, mime type ++>>>>38 regex application/[a-z\+\-]+ \b %s ++!:mime application/unknown+zip + + # OpenOffice.org / KOffice / StarOffice documents + # Listed here because they ARE zip files diff --git a/file.changes b/file.changes index d270a72..c18f60d 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 7 17:45:10 CEST 2009 - werner@suse.de + +- Add support for special zip archives (bnc#500511) + ------------------------------------------------------------------- Wed May 6 14:37:51 CEST 2009 - werner@suse.de diff --git a/file.spec b/file.spec index cf67cd0..c6eb9d1 100644 --- a/file.spec +++ b/file.spec @@ -31,7 +31,7 @@ Obsoletes: file-64bit # # Set Version also in python-magic.spec Version: 5.02 -Release: 1 +Release: 2 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -55,6 +55,7 @@ Patch22: file-4.24-cromfs.dif Patch24: file-4.24-warn.dif Patch25: file-5.02-javacheck.dif Patch26: file-4.24-solv.dif +Patch27: file-5.02-zip2.0.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -117,6 +118,7 @@ Authors: %patch24 -p0 -b .warn %patch25 -p0 -b .javacheck %patch26 -p0 -b .solv +%patch27 -p0 -b .zip2.0 %patch %build @@ -173,6 +175,8 @@ unset LD_LIBRARY_PATH %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Thu May 07 2009 werner@suse.de +- Add support for special zip archives (bnc#500511) * Wed May 06 2009 werner@suse.de - Update to filx version 5.02 * Read ~/.magic in addition to the default magic file not instead diff --git a/python-magic.spec b/python-magic.spec index b95268d..881070d 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -27,7 +27,7 @@ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on Version: 4.24 -Release: 53 +Release: 54 Summary: Python module to use libmagic %py_requires Source99: file.spec