From 945b7a93c22e56cb5531cbc5dd5c6624ccb0bd6e Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Jun 14 2011 06:00:24 +0000 Subject: fix #712991 - include RPM noarch in /usr/share/magic --- diff --git a/file-5.07-rpm-archs.patch b/file-5.07-rpm-archs.patch new file mode 100644 index 0000000..5d9a600 --- /dev/null +++ b/file-5.07-rpm-archs.patch @@ -0,0 +1,52 @@ +diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm +index c40e1b5..0cc0813 100644 +--- a/magic/Magdir/rpm ++++ b/magic/Magdir/rpm +@@ -4,23 +4,31 @@ + # + # RPM: file(1) magic for Red Hat Packages Erik Troan (ewt@redhat.com) + # +-0 beshort 0xedab +->2 beshort 0xeedb RPM ++0 belong 0xedabeedb RPM + !:mime application/x-rpm +->>4 byte x v%d +->>5 byte x \b.%d +->>6 beshort 1 src +->>6 beshort 0 bin +->>>8 beshort 1 i386/x86_64 +->>>8 beshort 2 Alpha/Sparc64 +->>>8 beshort 3 Sparc +->>>8 beshort 4 MIPS +->>>8 beshort 5 PowerPC +->>>8 beshort 6 68000 +->>>8 beshort 7 SGI +->>>8 beshort 8 RS6000 +->>>8 beshort 9 IA64 +->>>8 beshort 10 Sparc64 ++>4 byte x v%d ++>5 byte x \b.%d ++>6 beshort 1 src ++>6 beshort 0 bin ++>>8 beshort 1 i386/x86_64 ++>>8 beshort 2 Alpha/Sparc64 ++>>8 beshort 3 Sparc ++>>8 beshort 4 MIPS ++>>8 beshort 5 PowerPC ++>>8 beshort 6 68000 ++>>8 beshort 7 SGI ++>>8 beshort 8 RS6000 ++>>8 beshort 9 IA64 ++>>8 beshort 10 Sparc64 ++>>8 beshort 11 MIPSel ++>>8 beshort 12 ARM ++>>8 beshort 13 MiNT ++>>8 beshort 14 S/390 ++>>8 beshort 15 S/390x ++>>8 beshort 16 PowerPC64 ++>>8 beshort 17 SuperH ++>>8 beshort 18 Xtensa ++>>8 beshort 255 noarch + + #delta RPM Daniel Novotny (dnovotny@redhat.com) + 0 string drpm Delta RPM diff --git a/file.spec b/file.spec index 211343f..e494bd4 100644 --- a/file.spec +++ b/file.spec @@ -5,13 +5,13 @@ Summary: A utility for determining file types Name: file Version: 5.07 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ Patch1: file-5.04-zip64.patch -Patch2: file-5.05-rpm-archs.patch +Patch2: file-5.07-rpm-archs.patch Patch3: file-5.0.7-zip.patch Patch4: file-5.0.7-dos.patch Patch5: file-dell-bios.patch @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 14 2011 Jan Kaluza - 5.07-5 +- fix #712991 - include RPM noarch in /usr/share/magic + * Thu Jun 09 2011 Jan Kaluza - 5.07-4 - fix #711843 - fix postscript detection