[ghostscript/f12/master] Pulled in OpenSUSE fix for .runlibfileifexists (bug #610301).
Tim Waugh
twaugh at fedoraproject.org
Mon Sep 13 15:30:20 UTC 2010
commit a70c402edd2a12bee390dc2d2147e7057655f069
Author: Tim Waugh <twaugh at redhat.com>
Date: Mon Sep 13 15:07:13 2010 +0100
Pulled in OpenSUSE fix for .runlibfileifexists (bug #610301).
ghostscript-runlibfileifexists.patch | 26 ++++++++++++++++++++++++++
ghostscript.spec | 10 ++++++++--
2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch
index 3c14a98..911a90e 100644
--- a/ghostscript-runlibfileifexists.patch
+++ b/ghostscript-runlibfileifexists.patch
@@ -1,3 +1,29 @@
+diff -up ghostscript-8.71/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-8.71/Resource/Init/gs_fonts.ps
+--- ghostscript-8.71/Resource/Init/gs_fonts.ps.runlibfileifexists 2010-09-13 15:00:22.566812041 +0100
++++ ghostscript-8.71/Resource/Init/gs_fonts.ps 2010-09-13 15:03:24.520814577 +0100
+@@ -96,10 +96,19 @@ userdict /Fontmap .FontDirectory maxleng
+ % stack: dict file fontname filename|aliasname
+ 1 index type /stringtype eq
+ 1 index type /nametype eq and 1 index xcheck and
+- 1 index /run eq 2 index /.runlibfile eq or and {
++ 1 index /run eq 2 index /.runlibfile eq 3 index /.runlibfileifexists eq or or and {
+ % This is an inclusion entry.
+- pop findlibfile { exch pop } { file } ifelse
+- 2 index exch .readFontmap pop
++ 0 index /.runlibfileifexists eq {
++ pop findlibfile {
++ exch pop
++ 2 index exch .readFontmap pop
++ } {
++ pop
++ } ifelse
++ } {
++ pop findlibfile { exch pop } { file } ifelse
++ 2 index exch .readFontmap pop
++ } ifelse
+ } {
+ % This is a real entry.
+ % Read and pop tokens until a semicolon.
diff -up ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-8.64/Resource/Init/gs_init.ps
--- ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists 2009-01-08 09:17:18.000000000 +0000
+++ ghostscript-8.64/Resource/Init/gs_init.ps 2009-02-04 11:35:19.000000000 +0000
diff --git a/ghostscript.spec b/ghostscript.spec
index 951687f..70e3dc2 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer.
Name: ghostscript
Version: %{gs_ver}
-Release: 15%{?dist}
+Release: 16%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@@ -198,7 +198,9 @@ rm -rf libpng zlib jpeg jasper
# Restored Fontmap.local patch, incorrectly dropped after
# ghostscript-8.15.4-3 (bug #610301).
-%patch27 -p1 -b .Fontmap.local
+# Note: don't use -b here to avoid the backup file ending up in the
+# package manifest.
+%patch27 -p1
# Convert manual pages to UTF-8
from8859_1() {
@@ -388,6 +390,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
+* Mon Sep 13 2010 Tim Waugh <twaugh at redhat.com> 8.71-16
+- Pulled in gs_fonts.ps modification for .runlibfileifexists from
+ OpenSUSE package (bug #610301).
+
* Fri Sep 3 2010 Tim Waugh <twaugh at redhat.com> 8.71-15
- Restored Fontmap.local patch, incorrectly dropped after
ghostscript-8.15.4-3 (bug #610301).
More information about the scm-commits
mailing list