rpms/ghostscript
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f22'

Browse Source
This commit is contained in:
Tim Waugh 2015-03-31 11:00:13 +01:00
commit 4a858d4950
2 changed files with 102 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
ghostscript-urw-fonts-naming.patch Normal file
View File

@ -0,0 +1,93 @@
diff -up ghostscript-9.16/Resource/Init/Fontmap.GS.urw-fonts-naming ghostscript-9.16/Resource/Init/Fontmap.GS
--- ghostscript-9.16/Resource/Init/Fontmap.GS.urw-fonts-naming 2015-03-30 09:21:24.000000000 +0100
+++ ghostscript-9.16/Resource/Init/Fontmap.GS 2015-03-31 10:53:39.010004012 +0100
@@ -81,49 +81,49 @@
% Aliases
-/Bookman-Demi /BookmanURW-DemBol ;
-/Bookman-DemiItalic /BookmanURW-DemBolIta ;
-/Bookman-Light /BookmanURW-Lig ;
-/Bookman-LightItalic /BookmanURW-LigIta ;
-
-/Courier /NimbusMon-Reg ;
-/Courier-Oblique /NimbusMon-Obl ;
-/Courier-Bold /NimbusMon-Bol ;
-/Courier-BoldOblique /NimbusMon-BolObl ;
-
-/AvantGarde-Book /URWGothic-Boo ;
-/AvantGarde-BookOblique /URWGothic-BooObl ;
-/AvantGarde-Demi /URWGothic-Dem ;
-/AvantGarde-DemiOblique /URWGothic-DemObl ;
-
-/Helvetica /NimbusSan-Reg ;
-/Helvetica-Oblique /NimbusSan-Ita ;
-/Helvetica-Bold /NimbusSan-Bol ;
-/Helvetica-BoldOblique /NimbusSan-BolIta ;
-
-/Helvetica-Narrow /NimbusSanNar-Reg ;
-/Helvetica-Narrow-Oblique /NimbusSanNar-Ita ;
-/Helvetica-Narrow-Bold /NimbusSanNar-Bol ;
-/Helvetica-Narrow-BoldOblique /NimbusSanNar-BolIta ;
-
-/Palatino-Roman /PalladioURW-Rom ;
-/Palatino-Italic /PalladioURW-Ita ;
-/Palatino-Bold /PalladioURW-Bol ;
-/Palatino-BoldItalic /PalladioURW-BolIta ;
-
-/NewCenturySchlbk-Roman /CenturySchURW-Rom ;
-/NewCenturySchlbk-Italic /CenturySchURW-Ita ;
-/NewCenturySchlbk-Bold /CenturySchURW-Bol ;
-/NewCenturySchlbk-BoldItalic /CenturySchURW-BolIta ;
-
-/Times-Roman /NimbusRom-Reg ;
-/Times-Italic /NimbusRom-Ita ;
-/Times-Bold /NimbusRom-Med ;
-/Times-BoldItalic /NimbusRom-MedIta ;
+/Bookman-Demi /URWBookmanL-DemiBold ;
+/Bookman-DemiItalic /URWBookmanL-DemiBoldItal ;
+/Bookman-Light /URWBookmanL-Ligh ;
+/Bookman-LightItalic /URWBookmanL-LighItal ;
+
+/Courier /NimbusMonL-Regu ;
+/Courier-Oblique /NimbusMonL-ReguObli ;
+/Courier-Bold /NimbusMonL-Bold ;
+/Courier-BoldOblique /NimbusMonL-BoldObli ;
+
+/AvantGarde-Book /URWGothicL-Book ;
+/AvantGarde-BookOblique /URWGothicL-BookObli ;
+/AvantGarde-Demi /URWGothicL-Demi ;
+/AvantGarde-DemiOblique /URWGothicL-DemiObli ;
+
+/Helvetica /NimbusSanL-Regu ;
+/Helvetica-Oblique /NimbusSanL-ReguItal ;
+/Helvetica-Bold /NimbusSanL-Bold ;
+/Helvetica-BoldOblique /NimbusSanL-BoldItal ;
+
+/Helvetica-Narrow /NimbusSanL-ReguCond ;
+/Helvetica-Narrow-Oblique /NimbusSanL-ReguCondItal ;
+/Helvetica-Narrow-Bold /NimbusSanL-BoldCond ;
+/Helvetica-Narrow-BoldOblique /NimbusSanL-BoldCondItal ;
+
+/Palatino-Roman /URWPalladioL-Roma ;
+/Palatino-Italic /URWPalladioL-Ital ;
+/Palatino-Bold /URWPalladioL-Bold ;
+/Palatino-BoldItalic /URWPalladioL-BoldItal ;
+
+/NewCenturySchlbk-Roman /CenturySchL-Roma ;
+/NewCenturySchlbk-Italic /CenturySchL-Ital ;
+/NewCenturySchlbk-Bold /CenturySchL-Bold ;
+/NewCenturySchlbk-BoldItalic /CenturySchL-BoldItal ;
+
+/Times-Roman /NimbusRomNo9L-Regu ;
+/Times-Italic /NimbusRomNo9L-ReguItal ;
+/Times-Bold /NimbusRomNo9L-Medi ;
+/Times-BoldItalic /NimbusRomNo9L-MediItal ;
/Symbol /StandardSymL ;
-/ZapfChancery-MediumItalic /ChanceryURW-MedIta ;
+/ZapfChancery-MediumItalic /URWChanceryL-MediItal ;
/ZapfDingbats /Dingbats ;

11
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: 1%{?dist} Release: 2%{?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
@ -31,6 +31,7 @@ Patch6: ghostscript-Fontmap.local.patch
Patch7: ghostscript-wrf-snprintf.patch Patch7: ghostscript-wrf-snprintf.patch
Patch8: ghostscript-system-openjpeg2.patch Patch8: ghostscript-system-openjpeg2.patch
Patch9: ghostscript-system-zlib.patch Patch9: ghostscript-system-zlib.patch
Patch10: ghostscript-urw-fonts-naming.patch
Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-core%{?_isa} = %{version}-%{release}
Requires: %{name}-x11%{?_isa} = %{version}-%{release} Requires: %{name}-x11%{?_isa} = %{version}-%{release}
@ -145,9 +146,12 @@ rm -rf expat freetype icclib jasper jpeg jpegxr lcms lcms2 libpng openjpeg zlib
%patch8 -p1 -b .system-openjpeg2 %patch8 -p1 -b .system-openjpeg2
# Fixes for using the system zlib # Fixes for using the system zlib.
%patch9 -p1 -b .system-zlib %patch9 -p1 -b .system-zlib
# Use old names for urw-fonts (bug #1207577).
%patch10 -p1 -b .urw-fonts-naming
# 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}_"
@ -347,6 +351,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Tue Mar 31 2015 Tim Waugh <twaugh@redhat.com> 9.16-2
- Use old names for urw-fonts (bug #1207577).
* Mon Mar 30 2015 Tim Waugh <twaugh@redhat.com> 9.16-1 * Mon Mar 30 2015 Tim Waugh <twaugh@redhat.com> 9.16-1
- 9.16. - 9.16.