From 38814ab0364c38c4fad4d3234c492bc7b33410f2861809ece16a60bcc62e6a53 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 21 Aug 2008 16:07:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=21 --- file-4.24-javacheck.dif | 16 ++++++++++++++++ file.changes | 5 +++++ file.spec | 17 ++++++++++++++--- python-magic.spec | 13 ++++++++++--- 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 file-4.24-javacheck.dif diff --git a/file-4.24-javacheck.dif b/file-4.24-javacheck.dif new file mode 100644 index 0000000..cc4d52c --- /dev/null +++ b/file-4.24-javacheck.dif @@ -0,0 +1,16 @@ +--- magic/Magdir/cafebabe ++++ magic/Magdir/cafebabe +@@ -12,10 +12,10 @@ + # (and use as a hack). Let's not use 18, because the Mach-O people + # might add another one or two as time goes by... + # +-0 beshort 0xcafe +->2 beshort 0xbabe ++0 beshort 0xcafe cafe ++>2 beshort 0xbabe babe + !:mime application/x-java-applet +->>2 belong >30 compiled Java class data, ++>>4 belong >30 compiled Java class data, + >>>6 beshort x version %d. + >>>4 beshort x \b%d + >>4 belong 1 Mach-O fat file with 1 architecture diff --git a/file.changes b/file.changes index 25a27c5..93d8f18 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 19 18:51:46 CEST 2008 - ro@suse.de + +- fix detection for java bytecode + ------------------------------------------------------------------- Tue May 6 21:21:24 CEST 2008 - aj@suse.de diff --git a/file.spec b/file.spec index c675b9f..63ef10b 100644 --- a/file.spec +++ b/file.spec @@ -2,9 +2,16 @@ # spec file for package file (Version 4.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ Group: Productivity/File utilities AutoReqProv: on # Set Version also in python-magic.spec Version: 4.24 -Release: 8 +Release: 31 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -42,6 +49,7 @@ Patch21: file-4.16-python.dif Patch22: file-4.24-cromfs.dif Patch23: file-4.24-extfs-mp3.dif Patch24: file-4.24-warn.dif +Patch25: file-4.24-javacheck.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -103,6 +111,7 @@ Authors: %patch22 -p0 -b .cromfs %patch23 -p0 -b .extfs-mp3 %patch24 -p0 -b .warn +%patch25 -p0 -b .javacheck %patch %build @@ -166,6 +175,8 @@ unset LD_LIBRARY_PATH %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Tue Aug 19 2008 ro@suse.de +- fix detection for java bytecode * Tue May 06 2008 aj@suse.de - Do not return random data. * Thu Apr 24 2008 werner@suse.de diff --git a/python-magic.spec b/python-magic.spec index 606bb4f..f43707a 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -2,9 +2,16 @@ # spec file for package python-magic (Version 4.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ License: Other uncritical OpenSource License Group: Development/Languages/Python AutoReqProv: on Version: 4.24 -Release: 8 +Release: 38 Summary: Python module to use libmagic %py_requires Source99: file.spec