From 5c5fe72db2ddf37efe616e3de04919cea8c827d1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 22:22:47 -0700 Subject: [PATCH 1/3] - Rebuilt for gcc bug 634757 --- ghostscript.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghostscript.spec b/ghostscript.spec index 9a30953..4d63b06 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 16%{?dist} +Release: 16%{?dist}.1 # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 @@ -383,6 +383,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Wed Sep 29 2010 jkeating - 8.71-16.1 +- Rebuilt for gcc bug 634757 + * Mon Sep 13 2010 Tim Waugh 8.71-16 - Pulled in gs_fonts.ps modification for .runlibfileifexists from OpenSUSE package (bug #610301). From e32518926c3f30b44cd8c6e050963659ecfcac82 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 30 Sep 2010 16:28:57 +0100 Subject: [PATCH 2/3] Include more documentation (bug #634354). --- ghostscript.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ghostscript.spec b/ghostscript.spec index 9a30953..720eef5 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 16%{?dist} +Release: 17%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 @@ -301,6 +301,9 @@ install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resou mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript install -m0644 base/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript +# Documentation +install -m0644 doc/COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_dot_ver} + # Don't ship pkgconfig or libtool la files. rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc \ $RPM_BUILD_ROOT%{_libdir}/libijs.la @@ -338,7 +341,6 @@ rm -rf $RPM_BUILD_ROOT %files -f rpm.sharelist %defattr(-,root,root) -%doc doc/COPYING %dir %{_sysconfdir}/ghostscript %dir %{_sysconfdir}/ghostscript/%{gs_dot_ver} %dir %{_datadir}/ghostscript/%{gs_dot_ver} @@ -383,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Thu Sep 30 2010 Tim Waugh 8.71-17 +- Include more documentation (bug #634354). + * Mon Sep 13 2010 Tim Waugh 8.71-16 - Pulled in gs_fonts.ps modification for .runlibfileifexists from OpenSUSE package (bug #610301). From 1deda51edbc44fe3069194bd8b3ab5c91d7c9d97 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 30 Sep 2010 17:03:41 +0100 Subject: [PATCH 3/3] Don't use carriage return in ps2epsi output (bug #635786). --- ghostscript-ps2epsi-cr.patch | 14 ++++++++++++++ ghostscript.spec | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 ghostscript-ps2epsi-cr.patch diff --git a/ghostscript-ps2epsi-cr.patch b/ghostscript-ps2epsi-cr.patch new file mode 100644 index 0000000..79fd8b7 --- /dev/null +++ b/ghostscript-ps2epsi-cr.patch @@ -0,0 +1,14 @@ +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 diff --git a/ghostscript.spec b/ghostscript.spec index 720eef5..04777bc 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -43,6 +43,7 @@ Patch24: ghostscript-epstopdf-failure.patch Patch25: ghostscript-bbox-close.patch Patch26: ghostscript-gdevcups-ripcache.patch Patch27: ghostscript-Fontmap.local.patch +Patch28: ghostscript-ps2epsi-cr.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: xz @@ -204,6 +205,9 @@ rm -rf libpng zlib jpeg jasper # package manifest. %patch27 -p1 +# Don't use carriage return in ps2epsi output (bug #635786). +%patch28 -p1 -b .ps2epsi-cr + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -386,6 +390,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Sep 30 2010 Tim Waugh 8.71-17 +- Don't use carriage return in ps2epsi output (bug #635786). - Include more documentation (bug #634354). * Mon Sep 13 2010 Tim Waugh 8.71-16