From f0a2dd850ff0f5f78cd39b8d3be84ba8999607e1 Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Oct 27 2009 12:40:52 +0000
Subject: - fix #531082 - RFE: add detection of Python 3 bytecode

- fix #531127 - `file' command does not recognize mime type
    `image/vnd.djvu'

---

diff --git a/file-5.03-add-python-3.patch b/file-5.03-add-python-3.patch
new file mode 100644
index 0000000..b49f427
--- /dev/null
+++ b/file-5.03-add-python-3.patch
@@ -0,0 +1,22 @@
+diff -up file-5.03/magic/Magdir/python.add-python-3 file-5.03/magic/Magdir/python
+--- file-5.03/magic/Magdir/python.add-python-3	2009-10-26 15:06:23.387518090 -0400
++++ file-5.03/magic/Magdir/python	2009-10-26 15:06:37.122518374 -0400
+@@ -5,7 +5,8 @@
+ # From: David Necas <yeti@physics.muni.cz>
+ # often the module starts with a multiline string
+ 0	string		"""	a python script text executable
+-# MAGIC as specified in Python/import.c (1.5 to 2.3.0a)
++# MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming
++# that Py_UnicodeFlag is off for Python 2)
+ # 20121  ( YEAR - 1995 ) + MONTH  + DAY (little endian followed by "\r\n"
+ 0	belong		0x994e0d0a	python 1.5/1.6 byte-compiled
+ 0	belong		0x87c60d0a	python 2.0 byte-compiled
+@@ -15,6 +16,8 @@
+ 0	belong		0x6df20d0a	python 2.4 byte-compiled
+ 0	belong		0xb3f20d0a	python 2.5 byte-compiled
+ 0	belong		0xd1f20d0a	python 2.6 byte-compiled
++0	belong		0x3b0c0d0a	python 3.0 byte-compiled
++0	belong		0x4f0c0d0a	python 3.1 byte-compiled
+ 
+ 
+ 0	string/b  #!\ /usr/bin/python	python script text executable
diff --git a/file-5.03-djvu.patch b/file-5.03-djvu.patch
new file mode 100644
index 0000000..926bc9c
--- /dev/null
+++ b/file-5.03-djvu.patch
@@ -0,0 +1,21 @@
+diff -up file-5.03/magic/Magdir/images.djvu file-5.03/magic/Magdir/images
+--- file-5.03/magic/Magdir/images.djvu	2009-10-27 13:06:11.000000000 +0100
++++ file-5.03/magic/Magdir/images	2009-10-27 13:08:25.000000000 +0100
+@@ -545,12 +545,12 @@
+ # Reference: http://djvu.org/docs/DjVu3Spec.djvu
+ # Submitted by: Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+ # Modified by (1): Abel Cheung <abelcheung@gmail.com>
+-0	string	AT&TFORM
++0	string	AT&TFORM	DjVu
+ !:mime	image/vnd.djvu
+->12	string	DJVM		DjVu multiple page document
+->12	string	DJVU		DjVu image or single page document
+->12	string	DJVI		DjVu shared document
+->12	string	THUM		DjVu page thumbnails
++>12	string	DJVM		multiple page document
++>12	string	DJVU		image or single page document
++>12	string	DJVI		shared document
++>12	string	THUM		page thumbnails
+ 
+ 
+ # From Marc Espie
diff --git a/file.spec b/file.spec
index 712362e..cdc7dcf 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -18,6 +18,8 @@ Patch4: file-5.03-xfsdump.patch
 Patch5: file-5.03-ifany.patch
 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
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,10 @@ file(1) command.
 %patch6 -p1
 #fixes #530083
 %patch7 -p1
+#fixes #531082
+%patch8 -p1
+#fixes #531127
+%patch9 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -149,6 +155,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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'
+
 * 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