[ghostscript] 9.08rc1. CUPS filters moved to the cups-filters package.
Tim Waugh
twaugh at fedoraproject.org
Tue Aug 13 10:36:02 UTC 2013
commit 5e3e208813ff82b14c43036a0cc7dc114fd79d0e
Author: Tim Waugh <twaugh at redhat.com>
Date: Mon Aug 12 17:03:34 2013 +0100
9.08rc1. CUPS filters moved to the cups-filters package.
ghostscript-cups-colord.patch | 29 -
ghostscript-cups-filters.patch | 15 -
ghostscript-gs_sprintf.patch |28447 ----------------------------------
ghostscript-icc-missing-check.patch | 26 +-
ghostscript-pdfwrite-segfault.patch | 51 -
ghostscript-runlibfileifexists.patch | 16 +-
ghostscript-strange-fonts.patch | 61 -
ghostscript-zfapi-crash.patch | 12 -
ghostscript.spec | 57 +-
9 files changed, 22 insertions(+), 28692 deletions(-)
---
diff --git a/ghostscript-icc-missing-check.patch b/ghostscript-icc-missing-check.patch
index 702d966..dc51e91 100644
--- a/ghostscript-icc-missing-check.patch
+++ b/ghostscript-icc-missing-check.patch
@@ -1,16 +1,7 @@
-diff -up ghostscript-9.07/base/gsicc_manage.c.icc-missing-check ghostscript-9.07/base/gsicc_manage.c
---- ghostscript-9.07/base/gsicc_manage.c.icc-missing-check 2013-02-14 07:58:13.000000000 +0000
-+++ ghostscript-9.07/base/gsicc_manage.c 2013-02-14 17:15:48.974654828 +0000
-@@ -144,6 +144,8 @@ gsicc_set_iccsmaskprofile(const char *pn
- if (str != NULL) {
- icc_profile = gsicc_profile_new(str, mem, pname, namelen);
- code = sfclose(str);
-+ }
-+ if (str != NULL && icc_profile != NULL) {
- /* Get the profile handle */
- icc_profile->profile_handle =
- gsicc_get_profile_handle_buffer(icc_profile->buffer,
-@@ -593,6 +595,8 @@ gsicc_set_srcgtag_struct(gsicc_manager_t
+diff -up ghostscript-9.08rc1/base/gsicc_manage.c.icc-missing-check ghostscript-9.08rc1/base/gsicc_manage.c
+--- ghostscript-9.08rc1/base/gsicc_manage.c.icc-missing-check 2013-08-09 14:12:18.000000000 +0100
++++ ghostscript-9.08rc1/base/gsicc_manage.c 2013-08-09 16:54:11.167695694 +0100
+@@ -599,6 +599,8 @@ gsicc_set_srcgtag_struct(gsicc_manager_t
icc_profile =
gsicc_profile_new(str, mem, curr_ptr, strlen(curr_ptr));
code = sfclose(str);
@@ -19,12 +10,3 @@ diff -up ghostscript-9.07/base/gsicc_manage.c.icc-missing-check ghostscript-9.07
gsicc_init_profile_info(icc_profile);
cmm = gsCMM_DEFAULT;
/* Check if this object is a devicelink profile.
-@@ -1516,6 +1520,8 @@ gsicc_set_device_profile(gx_device * pde
- icc_profile =
- gsicc_profile_new(str, mem, file_name, strlen(file_name));
- code = sfclose(str);
-+ }
-+ if (str != NULL && icc_profile != NULL) {
- if (pro_enum < gsPROOFPROFILE) {
- if_debug1m(gs_debug_flag_icc, mem,
- "[icc] Setting device profile %d\n", pro_enum);
diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch
index 53cd5ca..46068b8 100644
--- a/ghostscript-runlibfileifexists.patch
+++ b/ghostscript-runlibfileifexists.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-9.06/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.06/Resource/Init/gs_fonts.ps
---- ghostscript-9.06/Resource/Init/gs_fonts.ps.runlibfileifexists 2012-08-08 09:01:36.000000000 +0100
-+++ ghostscript-9.06/Resource/Init/gs_fonts.ps 2012-08-09 08:23:46.750732348 +0100
+diff -up ghostscript-9.08rc1/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.08rc1/Resource/Init/gs_fonts.ps
+--- ghostscript-9.08rc1/Resource/Init/gs_fonts.ps.runlibfileifexists 2013-08-09 14:12:18.000000000 +0100
++++ ghostscript-9.08rc1/Resource/Init/gs_fonts.ps 2013-08-12 18:05:02.065802147 +0100
@@ -95,10 +95,19 @@ userdict /Fontmap .FontDirectory maxleng
% stack: dict file fontname filename|aliasname
1 index type /stringtype eq
@@ -24,10 +24,10 @@ diff -up ghostscript-9.06/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscri
} {
% This is a real entry.
% Read and pop tokens until a semicolon.
-diff -up ghostscript-9.06/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.06/Resource/Init/gs_init.ps
---- ghostscript-9.06/Resource/Init/gs_init.ps.runlibfileifexists 2012-08-08 09:01:36.000000000 +0100
-+++ ghostscript-9.06/Resource/Init/gs_init.ps 2012-08-09 08:23:46.750732348 +0100
-@@ -678,6 +678,14 @@ systemdict /internaldict dup .makeintern
+diff -up ghostscript-9.08rc1/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.08rc1/Resource/Init/gs_init.ps
+--- ghostscript-9.08rc1/Resource/Init/gs_init.ps.runlibfileifexists 2013-08-09 14:12:18.000000000 +0100
++++ ghostscript-9.08rc1/Resource/Init/gs_init.ps 2013-08-12 18:05:02.065802147 +0100
+@@ -680,6 +680,14 @@ systemdict /internaldict dup .makeintern
{ /undefinedfilename signalerror }
ifelse
} bind def
@@ -42,7 +42,7 @@ diff -up ghostscript-9.06/Resource/Init/gs_init.ps.runlibfileifexists ghostscrip
/selectdevice
{ finddevice setdevice .setdefaultscreen } bind def
/signalerror % <object> <errorname> signalerror -
-@@ -846,6 +854,7 @@ userdict /.currentresourcefile //null pu
+@@ -848,6 +856,7 @@ userdict /.currentresourcefile //null pu
} bind def
% Temporarily substitute it for the real runlibfile.
/.runlibfile /runlibfile load def
diff --git a/ghostscript.spec b/ghostscript.spec
index a4107e3..5b925c9 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,18 +1,20 @@
-%define gs_ver 9.07
-%define gs_dot_ver 9.07
+%define gs_ver 9.08
+%define gs_dot_ver 9.08
+%define rcver rc1
+%define dotrcver %{?rcver:.}%{?rcver}
%{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
-Release: 12%{?dist}
+Release: 0%{?dotrcver}.1%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
License: AGPLv3+ and Redistributable, no modification permitted
URL: http://www.ghostscript.com/
Group: Applications/Publishing
-Source0: http://downloads.ghostscript.com/public/ghostscript-%{gs_ver}.tar.bz2
+Source0: http://downloads.ghostscript.com/public/ghostscript-%{gs_ver}%{?rcver}.tar.gz
Source2: CIDFnmap
Source4: cidfmap
@@ -21,16 +23,10 @@ Patch2: ghostscript-scripts.patch
Patch3: ghostscript-noopt.patch
Patch4: ghostscript-runlibfileifexists.patch
Patch5: ghostscript-icc-missing-check.patch
-Patch6: ghostscript-cups-filters.patch
Patch7: ghostscript-Fontmap.local.patch
Patch8: ghostscript-iccprofiles-initdir.patch
Patch9: ghostscript-gdevcups-debug-uninit.patch
-Patch10: ghostscript-gs_sprintf.patch
-Patch11: ghostscript-pdfwrite-segfault.patch
-Patch12: ghostscript-strange-fonts.patch
Patch13: ghostscript-wrf-snprintf.patch
-Patch14: ghostscript-cups-colord.patch
-Patch15: ghostscript-zfapi-crash.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
Requires: poppler-data
@@ -97,17 +93,8 @@ Group: Applications/Publishing
%description gtk
A GTK-enabled version of Ghostscript, called 'gsx'.
-%package cups
-Summary: CUPS filter for interpreting PostScript and PDF
-Requires: %{name} = %{version}-%{release}
-Requires: cups
-Group: System Environment/Daemons
-
-%description cups
-CUPS filter and conversion rules for interpreting PostScript and PDF.
-
%prep
-%setup -q -n %{name}-%{gs_ver}
+%setup -q -n %{name}-%{gs_ver}%{?rcver}
rm -rf expat freetype icclib jasper jpeg lcms lcms2 libpng openjpeg zlib cups/libs
# Fix ijs-config not to have multilib conflicts (bug #192672)
@@ -125,9 +112,6 @@ rm -rf expat freetype icclib jasper jpeg lcms lcms2 libpng openjpeg zlib cups/li
# Fixed missing error check when setting ICC profile.
%patch5 -p1 -b .icc-missing-check
-# Install CUPS filter convs files in the correct place.
-%patch6 -p1 -b .cups-filters
-
# Restored Fontmap.local patch, incorrectly dropped after
# ghostscript-8.15.4-3 (bug #610301).
# Note: don't use -b here to avoid the backup file ending up in the
@@ -140,27 +124,9 @@ rm -rf expat freetype icclib jasper jpeg lcms lcms2 libpng openjpeg zlib cups/li
# gdevcups: don't use uninitialized variables in debugging output.
%patch9 -p1 -b .gdevcups-debug-uninit
-# Back-ported locale fix (bug #961149).
-%patch10 -p1 -b .gs_sprintf
-
-# Upstream patch to fix pdfwrite segfault (bug #962120).
-%patch11 -p1 -b .pdfwrite-segfault
-
-# Upstream patch from bug #690692 to handle strange fonts (bug #969660).
-%patch12 -p1 -b .strange-fonts
-
# Use more caution when converting floats to strings (bug #980085).
%patch13 -p1 -b .wrf-snprintf
-# Use correct colord device ID in gstoraster.
-%patch14 -p1 -b .cups-colord
-
-# Upstream patch from bug #693921 to avoid zfapi crash (bug #969785).
-%patch15 -p1 -b .zfapi-crash
-
-# Remove pdfopt man pages which were mistakenly left in (bug #963882).
-rm man/{de/,}pdfopt.1
-
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -339,12 +305,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_bindir}/gsx
-%files cups
-%defattr(-,root,root)
-%{_datadir}/cups/model/pxl*
-%{_datadir}/cups/mime/*.convs
-%{_cups_serverbin}/filter/*
-
%files devel
%defattr(-,root,root)
%dir %{_includedir}/ghostscript
@@ -357,6 +317,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
+* Mon Aug 12 2013 Tim Waugh <twaugh at redhat.com> 9.08-0.rc1.1
+- 9.08rc1. CUPS filters moved to the cups-filters package.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.07-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list