diff --git a/file-5.14-elfspace.patch b/file-5.14-elfspace.patch new file mode 100644 index 0000000..7c72382 --- /dev/null +++ b/file-5.14-elfspace.patch @@ -0,0 +1,16 @@ +diff --git a/magic/Magdir/elf b/magic/Magdir/elf +index 83bdbbf..aa9f539 100644 +--- a/magic/Magdir/elf ++++ b/magic/Magdir/elf +@@ -189,9 +189,9 @@ + >4 byte 1 32-bit + >4 byte 2 64-bit + >5 byte 0 invalid byte order +->5 byte 1 LSB ++>5 byte 1 LSB + >>0 use elf-le +->5 byte 2 MSB ++>5 byte 2 MSB + >>0 use \^elf-le + # Up to now only 0, 1 and 2 are defined; I've seen a file with 0x83, it seemed + # like proper ELF, but extracting the string had bad results. diff --git a/file.spec b/file.spec index ac25007..40b25d2 100644 --- a/file.spec +++ b/file.spec @@ -3,7 +3,7 @@ Summary: A utility for determining file types Name: file Version: 5.14 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -18,6 +18,7 @@ Patch5: file-5.04-man-return-code.patch Patch6: file-5.04-generic-msdos.patch Patch7: file-5.14-x86boot.patch Patch8: file-5.14-perl.patch +Patch9: file-5.14-elfspace.patch URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -71,6 +72,7 @@ file(1) command. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -148,6 +150,9 @@ cd python %endif %changelog +* Mon Mar 25 2013 Jan Kaluza - 5.14-2 +- fix useless space in ELF output which could break libtool + * Fri Mar 22 2013 Jan Kaluza - 5.14-1 - fix #891856 - update to file-5.14 - fix #909754 - magic number for Python-3.3