Merge branch 'f14'
This commit is contained in:
commit
d315dcd79a
@ -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
|
|
@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
|
|||||||
Name: ghostscript
|
Name: ghostscript
|
||||||
Version: %{gs_ver}
|
Version: %{gs_ver}
|
||||||
|
|
||||||
Release: 3%{?dist}
|
Release: 4%{?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
|
||||||
@ -28,7 +28,6 @@ Patch12: ghostscript-vsnprintf.patch
|
|||||||
Patch21: ghostscript-jbig2-image-refcount.patch
|
Patch21: ghostscript-jbig2-image-refcount.patch
|
||||||
Patch27: ghostscript-Fontmap.local.patch
|
Patch27: ghostscript-Fontmap.local.patch
|
||||||
Patch28: ghostscript-iccprofiles-initdir.patch
|
Patch28: ghostscript-iccprofiles-initdir.patch
|
||||||
Patch29: ghostscript-ps2epsi-cr.patch
|
|
||||||
|
|
||||||
Requires: urw-fonts >= 1.1, ghostscript-fonts
|
Requires: urw-fonts >= 1.1, ghostscript-fonts
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
@ -142,9 +141,6 @@ rm -rf libpng zlib jpeg jasper
|
|||||||
# Don't assume %rom% device is available for initial ICC profile dir.
|
# Don't assume %rom% device is available for initial ICC profile dir.
|
||||||
%patch28 -p1 -b .iccprofiles-initdir
|
%patch28 -p1 -b .iccprofiles-initdir
|
||||||
|
|
||||||
# Don't use carriage return in ps2epsi output (bug #635786).
|
|
||||||
%patch29 -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}_"
|
||||||
@ -327,6 +323,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/libgs.so
|
%{_libdir}/libgs.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 1 2010 Tim Waugh <twaugh@redhat.com> 9.00-4
|
||||||
|
- Reverted incorrect change introduced to fix bug #635786.
|
||||||
|
|
||||||
* Thu Sep 30 2010 Tim Waugh <twaugh@redhat.com> 9.00-3
|
* Thu Sep 30 2010 Tim Waugh <twaugh@redhat.com> 9.00-3
|
||||||
- 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).
|
||||||
|
Loading…
Reference in New Issue
Block a user