This commit is contained in:
Daniel Novotny 2009-11-05 15:16:53 +00:00
parent f0a2dd850f
commit 18b83425e0
2 changed files with 31 additions and 1 deletions

24
file-5.03-delta.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up file-5.03/magic/Magdir/filesystems.delta file-5.03/magic/Magdir/filesystems
--- file-5.03/magic/Magdir/filesystems.delta 2009-11-05 16:09:43.000000000 +0100
+++ file-5.03/magic/Magdir/filesystems 2009-11-05 16:11:52.000000000 +0100
@@ -1399,3 +1399,7 @@
0 string XFSM
>0x200 string XFSB XFS filesystem metadump image
+#delta ISO Daniel Novotny (dnovotny@redhat.com)
+0 string DISO Delta ISO data
+>4 belong x version %d
+
diff -up file-5.03/magic/Magdir/rpm.delta file-5.03/magic/Magdir/rpm
--- file-5.03/magic/Magdir/rpm.delta 2009-11-05 14:59:54.000000000 +0100
+++ file-5.03/magic/Magdir/rpm 2009-11-05 15:02:43.000000000 +0100
@@ -21,3 +21,9 @@
>>8 beshort 11 MIPSel
>>8 beshort 12 ARM
>>10 string x %s
+
+#delta RPM Daniel Novotny (dnovotny@redhat.com)
+0 string drpm Delta RPM
+!:mime application/x-rpm
+>12 string x %s
+

View File

@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.03
Release: 11%{?dist}
Release: 12%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -20,6 +20,7 @@ Patch6: file-5.03-multilib.patch
Patch7: file-5.03-ppcswap.patch
Patch8: file-5.03-add-python-3.patch
Patch9: file-5.03-djvu.patch
Patch10: file-5.03-delta.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -81,6 +82,8 @@ file(1) command.
%patch8 -p1
#fixes #531127
%patch9 -p1
#fixes #533151
%patch10 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -155,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Thu Nov 05 2009 Daniel Novotny <dnovotny@redhat.com> 5.03-12
- fix #533151 - file command doesn't recognize deltaisos or rpm-only deltarpms
* Tue Oct 27 2009 Daniel Novotny <dnovotny@redhat.com> 5.03-11
- fix #531082 - RFE: add detection of Python 3 bytecode
- fix #531127 - `file' command does not recognize mime type `image/vnd.djvu'