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-09-30 17:22:14 +01:00
commit 5a1f2e81bc
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ghostscript-ps2epsi-cr.patch Normal file
View File

@ -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

14
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: 16%{?dist}.1 Release: 17%{?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,6 +43,7 @@ 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
@ -204,6 +205,9 @@ 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}_"
@ -301,6 +305,9 @@ install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resou
mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript
install -m0644 base/errors.h $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. # Don't ship pkgconfig or libtool la files.
rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc \ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc \
$RPM_BUILD_ROOT%{_libdir}/libijs.la $RPM_BUILD_ROOT%{_libdir}/libijs.la
@ -338,7 +345,6 @@ rm -rf $RPM_BUILD_ROOT
%files -f rpm.sharelist %files -f rpm.sharelist
%defattr(-,root,root) %defattr(-,root,root)
%doc doc/COPYING
%dir %{_sysconfdir}/ghostscript %dir %{_sysconfdir}/ghostscript
%dir %{_sysconfdir}/ghostscript/%{gs_dot_ver} %dir %{_sysconfdir}/ghostscript/%{gs_dot_ver}
%dir %{_datadir}/ghostscript/%{gs_dot_ver} %dir %{_datadir}/ghostscript/%{gs_dot_ver}
@ -383,6 +389,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Thu Sep 30 2010 Tim Waugh <twaugh@redhat.com> 8.71-17
- Don't use carriage return in ps2epsi output (bug #635786).
- Include more documentation (bug #634354).
* Wed Sep 29 2010 jkeating - 8.71-16.1 * Wed Sep 29 2010 jkeating - 8.71-16.1
- Rebuilt for gcc bug 634757 - Rebuilt for gcc bug 634757