This commit is contained in:
Daniel Novotny 2009-10-21 13:55:35 +00:00
parent 155d979a88
commit 5cccfe7e04
2 changed files with 20 additions and 1 deletions

13
file-5.03-ppcswap.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up file-5.03/magic/Magdir/linux.ppcswap file-5.03/magic/Magdir/linux
--- file-5.03/magic/Magdir/linux.ppcswap 2009-10-21 15:48:42.000000000 +0200
+++ file-5.03/magic/Magdir/linux 2009-10-21 15:50:09.000000000 +0200
@@ -61,6 +61,9 @@
>0x404 long x size %d pages
>>4086 string SWAPSPACE2
>>>1052 string >\0 Label %s
+# From Daniel Novotny <dnovotny@redhat.com>
+# swap file for PowerPC
+65526 string SWAPSPACE2 Linux/ppc swap file
# ECOFF magic for OSF/1 and Linux (only tested under Linux though)
#
# from Erik Troan (ewt@redhat.com) examining od dumps, so this

View File

@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.03
Release: 9%{?dist}
Release: 10%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -17,6 +17,7 @@ Patch3: file-5.03-fonts-postscript.patch
Patch4: file-5.03-xfsdump.patch
Patch5: file-5.03-ifany.patch
Patch6: file-5.03-multilib.patch
Patch7: file-5.03-ppcswap.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -72,6 +73,8 @@ file(1) command.
%patch5 -p1
#fixes #515767
%patch6 -p1
#fixes #530083
%patch7 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -146,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Wed Oct 21 2009 Daniel Novotny <dnovotny@redhat.com> 5.03-10
- fix #530083 - file -s is not able to detect swap signature on ppc
* Tue Aug 25 2009 Daniel Novotny <dnovotny@redhat.com> 5.03-9
- fix #515767 - multilib: file /usr/share/misc/magic.mgc conflicts