rpms/ghostscript
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f13' into f14

Browse Source
This commit is contained in:
Tim Waugh 2010-10-01 17:24:09 +01:00
commit 1e7576b8e9
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ghostscript-ps2epsi-cr.patch
View File

@ -1,14 +0,0 @@
diff -up ghostscript-8.71/lib/ps2epsi.ps.ps2epsi-cr ghostscript-8.71/lib/ps2epsi.ps
--- ghostscript-8.71/lib/ps2epsi.ps.ps2epsi-cr 2010-09-30 17:02:05.673891679 +0100
+++ ghostscript-8.71/lib/ps2epsi.ps 2010-09-30 17:02:13.877891640 +0100
@@ -193,8 +193,8 @@ ps2edict begin
epsifile (\n) writestring
epsifile flushfile
- epsifile BBoxString writestring epsifile (\r) writestring
- epsifile HiresBBoxString writestring epsifile (\r) writestring
+ epsifile BBoxString writestring epsifile (\n) writestring
+ epsifile HiresBBoxString writestring epsifile (\n) writestring
% Define character and bit widths for the output line buffer:
/cwidth rm lm sub 1 add def

9
ghostscript.spec
View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 17%{?dist} Release: 18%{?dist}
# Included CMap data is Redistributable, no modification permitted, # Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510 # see http://bugzilla.redhat.com/487510
@ -43,7 +43,6 @@ Patch24: ghostscript-epstopdf-failure.patch
Patch25: ghostscript-bbox-close.patch Patch25: ghostscript-bbox-close.patch
Patch26: ghostscript-gdevcups-ripcache.patch Patch26: ghostscript-gdevcups-ripcache.patch
Patch27: ghostscript-Fontmap.local.patch Patch27: ghostscript-Fontmap.local.patch
Patch28: ghostscript-ps2epsi-cr.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: xz BuildRequires: xz
@ -205,9 +204,6 @@ rm -rf libpng zlib jpeg jasper
# package manifest. # package manifest.
%patch27 -p1 %patch27 -p1
# Don't use carriage return in ps2epsi output (bug #635786).
%patch28 -p1 -b .ps2epsi-cr
# Convert manual pages to UTF-8 # Convert manual pages to UTF-8
from8859_1() { from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@ -389,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Fri Oct 1 2010 Tim Waugh <twaugh@redhat.com> 8.71-18
- Reverted incorrect change introduced to fix bug #635786.
* Thu Sep 30 2010 Tim Waugh <twaugh@redhat.com> 8.71-17 * Thu Sep 30 2010 Tim Waugh <twaugh@redhat.com> 8.71-17
- Don't use carriage return in ps2epsi output (bug #635786). - Don't use carriage return in ps2epsi output (bug #635786).
- Include more documentation (bug #634354). - Include more documentation (bug #634354).