From 82983ef8781f5243310113b1137f40fb758ff226e6cd1ab2e3846226216c8686 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 25 Apr 2008 13:11:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=19 --- file-4.24-extfs-mp3.dif | 11 +++++++++++ file.changes | 5 +++++ file.spec | 6 +++++- python-magic.spec | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 file-4.24-extfs-mp3.dif diff --git a/file-4.24-extfs-mp3.dif b/file-4.24-extfs-mp3.dif new file mode 100644 index 0000000..585932b --- /dev/null +++ b/file-4.24-extfs-mp3.dif @@ -0,0 +1,11 @@ +--- magic/Magdir/animation ++++ magic/Magdir/animation 2008-04-24 19:27:05.898695896 +0200 +@@ -276,7 +276,7 @@ + # modified by Joerg Jenderek + # GRR the original test are too common for many DOS files + # so don't accept as MP3 until we've tested the rate +-0 beshort&0xFFFE ++0 beshort&0xFFFE 0xFFFA + # rates + >2 byte&0xF0 0x10 MPEG ADTS, layer III, v1, 32 kbps + !:mime audio/mpeg diff --git a/file.changes b/file.changes index 076914e..da76cd4 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 24 19:27:57 CEST 2008 - werner@suse.de + +- Don't slip into Mp3 channel for ext file systems (bnc#383431) + ------------------------------------------------------------------- Mon Apr 14 17:35:43 CEST 2008 - werner@suse.de diff --git a/file.spec b/file.spec index 94ed364..03af08b 100644 --- a/file.spec +++ b/file.spec @@ -19,7 +19,7 @@ Group: Productivity/File utilities AutoReqProv: on # Set Version also in python-magic.spec Version: 4.24 -Release: 3 +Release: 5 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -40,6 +40,7 @@ Patch16: file-4.21-reiserfs.dif Patch20: file-4.24-mips.dif Patch21: file-4.16-python.dif Patch22: file-4.24-cromfs.dif +Patch23: file-4.24-extfs-mp3.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -99,6 +100,7 @@ Authors: %patch21 -p0 -b .python %endif %patch22 -p0 -b .cromfs +%patch23 -p0 -b .extfs-mp3 %patch %build @@ -162,6 +164,8 @@ unset LD_LIBRARY_PATH %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Thu Apr 24 2008 werner@suse.de +- Don't slip into Mp3 channel for ext file systems (bnc#383431) * Mon Apr 14 2008 werner@suse.de - Add CROM File System to Localstuff (bnc#379027) - Update to file bugfix version 4.24 diff --git a/python-magic.spec b/python-magic.spec index 6b5db55..ffafca9 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -20,7 +20,7 @@ License: Other uncritical OpenSource License Group: Development/Languages/Python AutoReqProv: on Version: 4.24 -Release: 1 +Release: 3 Summary: Python module to use libmagic %py_requires Source99: file.spec