From cb52735b81cb42c9d5e864008afabaaaecd1fcc1 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Tue, 16 Jun 2009 09:35:13 +0000 Subject: [PATCH] fix #505758, #505759, #505765 (postscript font issues) --- file-5.03-fonts-postscript.patch | 21 +++++++++++++++++++++ file.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 file-5.03-fonts-postscript.patch diff --git a/file-5.03-fonts-postscript.patch b/file-5.03-fonts-postscript.patch new file mode 100644 index 0000000..2bb72e2 --- /dev/null +++ b/file-5.03-fonts-postscript.patch @@ -0,0 +1,21 @@ +diff -up file-5.03/magic/Magdir/fonts.orig file-5.03/magic/Magdir/fonts +--- file-5.03/magic/Magdir/fonts.orig 2009-06-13 09:53:07.581775320 -0400 ++++ file-5.03/magic/Magdir/fonts 2009-06-13 09:51:04.221775135 -0400 +@@ -9,6 +9,8 @@ + 0 string %!PS-AdobeFont-1. PostScript Type 1 font text + >20 string >\0 (%s) + 6 string %!PS-AdobeFont-1. PostScript Type 1 font program data ++6 string %!FontType1 PostScript Type 1 font program data ++0 string %!PS-Adobe-3.0\ Resource-Font PostScript Type 1 font text + + # X11 font files in SNF (Server Natural Format) format + 0 belong 00000004 X11 SNF font data, MSB first +@@ -58,7 +60,7 @@ + 0 string ttcf TrueType font collection data + + # Opentype font data from Avi Bercovich +-0 string OTTO OpenType font data ++0 string OTTO OpenType font data + + # Gürkan Sengün , www.linuks.mine.nu + 0 string SplineFontDB: Spline Font Database diff --git a/file.spec b/file.spec index 4594b75..049bd94 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.03 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -13,6 +13,7 @@ URL: http://www.darwinsys.com/file/ Patch0: file-4.21-pybuild.patch Patch1: file-5.00-devdrv.patch Patch2: file-5.00-mdmp.patch +Patch3: file-5.03-fonts-postscript.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +64,8 @@ file(1) command. %patch1 -p1 #fixes #485835 %patch2 -p1 +#fixes #505758, #505759, #505765 +%patch3 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -137,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 16 2009 Daniel Novotny 5.03-3 +- added magic for three font issues (PostScript fonts) + (#505758, #505759, #505765) + * Thu May 14 2009 Daniel Novotny 5.03-2 - fix #500739 - Disorganized magic* file locations in file-libs