[file] * Thu Aug 12 2010 Jan Kaluza <jkaluza at redhat.com> - 5.04-14 - fix #623602 - support for Python 2.7 c
Jan Kaluža
jkaluza at fedoraproject.org
Thu Aug 12 12:50:54 UTC 2010
commit 81cc9bb203a080a988acd467911d2995f8f97b9c
Author: Jan Kaluza <hanzz.k at gmail.com>
Date: Thu Aug 12 14:50:56 2010 +0200
* Thu Aug 12 2010 Jan Kaluza <jkaluza at redhat.com> - 5.04-14
- fix #623602 - support for Python 2.7 compiled files
file-5.04-python-2.7.patch | 20 ++++++++++++++++++++
file.spec | 8 +++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/file-5.04-python-2.7.patch b/file-5.04-python-2.7.patch
new file mode 100644
index 0000000..fe8614e
--- /dev/null
+++ b/file-5.04-python-2.7.patch
@@ -0,0 +1,20 @@
+diff -up file-5.04/magic/Magdir/python.py27 file-5.04/magic/Magdir/python
+--- file-5.04/magic/Magdir/python.py27 2009-10-27 15:49:57.000000000 +0100
++++ file-5.04/magic/Magdir/python 2010-08-12 11:44:48.387964124 +0200
+@@ -6,7 +6,7 @@
+ # From: David Necas <yeti at 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.6a1 and 3.1a0, assuming
++# MAGIC as specified in Python/import.c (1.5 to 2.7a0 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
+@@ -17,6 +17,7 @@
+ 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 0x03f30d0a python 2.7 byte-compiled
+ 0 belong 0x3b0c0d0a python 3.0 byte-compiled
+ 0 belong 0x4f0c0d0a python 3.1 byte-compiled
+
diff --git a/file.spec b/file.spec
index 65588dc..08c9e46 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.04
-Release: 13%{?dist}
+Release: 14%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -23,6 +23,7 @@ Patch9: file-5.04-retval.patch
Patch10: file-5.04-html-regression.patch
Patch11: file-5.04-zmachine-magic-update.patch
Patch12: file-5.04-core-prpsinfo.patch
+Patch13: file-5.04-python-2.7.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -99,6 +100,8 @@ file(1) command.
%patch11 -p1
#fixes #599695
%patch12 -p1
+#fixes #623602
+%patch13 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@@ -176,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Aug 12 2010 Jan Kaluza <jkaluza at redhat.com> - 5.04-14
+- fix #623602 - support for Python 2.7 compiled files
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 5.04-13
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list