Accepting request 531150 from home:jsmeix:branches:Printing

Build ghostscript-fonts cleanly (without questionable SUSE-specific patching)

OBS-URL: https://build.opensuse.org/request/show/531150
OBS-URL: https://build.opensuse.org/package/show/Printing/ghostscript-fonts?expand=0&rev=12
This commit is contained in:
Johannes Meixner 2017-10-04 10:41:10 +00:00 committed by Git OBS Bridge
parent b339fb4e35
commit 43ae87585a
3 changed files with 15 additions and 191 deletions

View File

@ -1,161 +0,0 @@
--- n021004l.pfa.~1~ 2004-03-24 12:00:35.274859345 +0100
+++ n021004l.pfa 2004-03-24 12:02:25.536099592 +0100
@@ -21,7 +21,7 @@
/Notice (Copyright \050URW\051++,Copyright 1999 by \050URW\051++ Design & Development; Cyrillic glyphs added by Valek Filippov \050C\051 2001-2002) readonly def
/FullName (Nimbus Roman No9 L Medium) readonly def
/FamilyName (Nimbus Roman No9 L) readonly def
- /Weight (Medium) readonly def
+ /Weight (Bold) readonly def
/FSType 0 def
/ItalicAngle 0 def
/isFixedPitch false def
--- n021024l.pfa.~1~ 2004-03-24 12:01:46.029254461 +0100
+++ n021024l.pfa 2004-03-24 12:02:47.129642326 +0100
@@ -21,7 +21,7 @@
/Notice (Copyright \050URW\051++,Copyright 1999 by \050URW\051++ Design & Development; Cyrillic glyphs added by Valek Filippov \050C\051 2001-2002) readonly def
/FullName (Nimbus Roman No9 L Medium Italic) readonly def
/FamilyName (Nimbus Roman No9 L) readonly def
- /Weight (Medium) readonly def
+ /Weight (Bold) readonly def
/FSType 0 def
/ItalicAngle -15.3 def
/isFixedPitch false def
--- n022004l.pfa 2004-03-26 01:12:04.624871931 +0100
+++ n022004l.pfa 2004-03-26 01:10:22.160022000 +0100
@@ -24,7 +24,7 @@
/Weight (Bold) readonly def
/FSType 0 def
/ItalicAngle 0 def
- /isFixedPitch false def
+ /isFixedPitch true def
/UnderlinePosition -100 def
/UnderlineThickness 50 def
end readonly def
@@ -3747,4 +3747,4 @@
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
cleartomark
-{restore}if
\ No newline at end of file
+{restore}if
--- n022023l.pfa 2004-03-26 01:12:04.630870693 +0100
+++ n022023l.pfa 2004-03-26 01:10:54.092430000 +0100
@@ -24,7 +24,7 @@
/Weight (Regular) readonly def
/FSType 0 def
/ItalicAngle -12 def
- /isFixedPitch false def
+ /isFixedPitch true def
/UnderlinePosition -100 def
/UnderlineThickness 50 def
end readonly def
@@ -3145,4 +3145,4 @@
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
cleartomark
-{restore}if
\ No newline at end of file
+{restore}if
--- n022024l.pfa 2004-03-26 01:12:04.636869454 +0100
+++ n022024l.pfa 2004-03-26 01:11:21.153845000 +0100
@@ -24,7 +24,7 @@
/Weight (Bold) readonly def
/FSType 0 def
/ItalicAngle -12 def
- /isFixedPitch false def
+ /isFixedPitch true def
/UnderlinePosition -100 def
/UnderlineThickness 50 def
end readonly def
@@ -3554,4 +3554,4 @@
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
cleartomark
-{restore}if
\ No newline at end of file
+{restore}if
--- n022004l.afm 2002-12-25 21:40:09.000000000 +0100
+++ n022004l.afm 2005-03-18 16:10:02.000000000 +0100
@@ -7,7 +7,7 @@
Weight Bold
Notice (Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development; Cyrillic glyphs aded by Valek Filippov (C) 2001-2002)
ItalicAngle 0
-IsFixedPitch false
+IsFixedPitch true
UnderlinePosition -100
UnderlineThickness 50
Version 1.06
--- n022023l.afm 2002-12-25 21:38:57.000000000 +0100
+++ n022023l.afm 2005-03-18 16:09:40.000000000 +0100
@@ -7,7 +7,7 @@
Weight Regular
Notice (Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development; Cyrillic glyphs added by Valek Filippov (C) 2001)
ItalicAngle -12
-IsFixedPitch false
+IsFixedPitch true
UnderlinePosition -100
UnderlineThickness 50
Version 1.06
--- n022024l.afm 2002-12-25 21:40:33.000000000 +0100
+++ n022024l.afm 2005-03-18 16:10:25.000000000 +0100
@@ -7,7 +7,7 @@
Weight Bold
Notice (Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development; Cyrillic glyphs added by Valek Filippov (C) 2001-2002)
ItalicAngle -12
-IsFixedPitch false
+IsFixedPitch true
UnderlinePosition -100
UnderlineThickness 50
Version 1.06
--- n019043l.pfa.~1~ 2008-03-06 17:23:47.000000000 +0100
+++ n019043l.pfa 2008-03-06 17:25:20.000000000 +0100
@@ -26,8 +26,8 @@
/FontInfo 10 dict dup begin
/version (1.06) readonly def
/Notice (Copyright \050URW\051++,Copyright 1999 by \050URW\051++ Design & Development; Cyrillic glyphs added by Valek Filippov \050C\051 2001-2002) readonly def
- /FullName (Nimbus Sans L Regular Condensed) readonly def
- /FamilyName (Nimbus Sans L) readonly def
+ /FullName (Nimbus Sans L Condensed Regular) readonly def
+ /FamilyName (Nimbus Sans L Condensed) readonly def
/Weight (Regular) readonly def
/FSType 0 def
/ItalicAngle 0 def
--- n019044l.pfa.~1~ 2008-03-06 17:23:47.000000000 +0100
+++ n019044l.pfa 2008-03-06 17:26:16.000000000 +0100
@@ -26,8 +26,8 @@
/FontInfo 10 dict dup begin
/version (1.06) readonly def
/Notice (Copyright \050URW\051++,Copyright 1999 by \050URW\051++ Design & Development; Cyrillic glyphs added by Valek Filippov \050C\051 2001) readonly def
- /FullName (Nimbus Sans L Bold Condensed) readonly def
- /FamilyName (Nimbus Sans L) readonly def
+ /FullName (Nimbus Sans L Condensed Bold) readonly def
+ /FamilyName (Nimbus Sans L Condensed) readonly def
/Weight (Bold) readonly def
/FSType 0 def
/ItalicAngle 0 def
--- n019063l.pfa.~1~ 2008-03-06 17:23:47.000000000 +0100
+++ n019063l.pfa 2008-03-06 17:27:16.000000000 +0100
@@ -26,8 +26,8 @@
/FontInfo 10 dict dup begin
/version (1.06) readonly def
/Notice (Copyright \050URW\051++,Copyright 1999 by \050URW\051++ Design & Development; Cyrillic glyphs added by Valek Filippov \050C\051 2001) readonly def
- /FullName (Nimbus Sans L Regular Condensed Italic) readonly def
- /FamilyName (Nimbus Sans L) readonly def
+ /FullName (Nimbus Sans L Condensed Regular Italic) readonly def
+ /FamilyName (Nimbus Sans L Condensed) readonly def
/Weight (Regular) readonly def
/FSType 0 def
/ItalicAngle -9.9 def
--- n019064l.pfa.~1~ 2008-03-06 17:23:47.000000000 +0100
+++ n019064l.pfa 2008-03-06 17:28:06.000000000 +0100
@@ -19,8 +19,8 @@
/FontInfo 10 dict dup begin
/version (1.06) readonly def
/Notice (Copyright \050URW\051++,Copyright 1999 by \050URW\051++ Design & Development; Cyrillic glyphs added by Valek Filippov \050C\051 2001-2002) readonly def
- /FullName (Nimbus Sans L Bold Condensed Italic) readonly def
- /FamilyName (Nimbus Sans L) readonly def
+ /FullName (Nimbus Sans L Condensed Bold Italic) readonly def
+ /FamilyName (Nimbus Sans L Condensed) readonly def
/Weight (Bold) readonly def
/FSType 12 def
/ItalicAngle -9.9 def

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Oct 4 12:24:39 CEST 2017 - jsmeix@suse.de
- Do no longer mess around with the original fonts: Do no longer
try to "improve" the appearance of glyphs in certain fonts in
a SUSE-sepcific way. Provide the fonts as originally intended.
Now neither the SUSE-sepcific ghostscript-fonts-std-8.11.patch
nor special tools like t1ascii and t1binary from the t1utils RPM
are needed to build a RPM package that only contains fonts.
Cf. the entry below dated "Tue Mar 27 16:57:57 CEST 2012".
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 28 16:35:29 CEST 2012 - jsmeix@suse.de Fri Sep 28 16:35:29 CEST 2012 - jsmeix@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package ghostscript-fonts # spec file for package ghostscript-fonts
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,10 +23,6 @@ BuildArch: noarch
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
%endif %endif
# t1utils is needed to convert PostScript Type 1 font program data (*.pfb)
# to PostScript (*.pfa) so that ghostscript-fonts-std-8.11.patch can be applied
# and afterwards back to PostScript Type 1 font program data:
BuildRequires: t1utils
Url: http://www.ghostscript.com/ Url: http://www.ghostscript.com/
Summary: Ghostscript's free fonts Summary: Ghostscript's free fonts
License: GPL-2.0 License: GPL-2.0
@ -55,16 +51,7 @@ Source1: ghostscript-fonts-other-6.0.tar.gz
# Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch10...Patch99 is for patches from SUSE which are intended for upstream:
# #
# Source100...Source999 is for sources from SUSE which are not intended for upstream: # Source100...Source999 is for sources from SUSE which are not intended for upstream:
# Source100 ghostscript-fonts-std-8.11.patch is made by mfabian@suse.de #
# see https://bugzilla.novell.com/show_bug.cgi?id=suse36778 (bnc#51778).
# It changes the weight of "Nimbus Roman No9 L:style=Medium Italic" and
# "Nimbus Roman No9 L:style=Medium" back to "Bold" instead of "Medium".
# ghostscript-fonts-std-8.11.patch must be listed as SourceNNN
# because it is applied via an explicit patch call in install section
# but the SUSE internal check_if_valid_source_dir tool could abort
# with fatal error because it thinks this patch is not applied
# (see https://bugzilla.novell.com/show_bug.cgi?id=649207#c17):
Source100: ghostscript-fonts-std-8.11.patch
# Patch100...Patch999 is for patches from SUSE which are not intended for upstream: # Patch100...Patch999 is for patches from SUSE which are not intended for upstream:
# #
# The main-package ghostscript-fonts alone is useless because it does not contain any font file. # The main-package ghostscript-fonts alone is useless because it does not contain any font file.
@ -137,22 +124,9 @@ the documentation on Hershey fonts.
FONT_INSTALL_DIR=%{buildroot}%{_datadir}/ghostscript/fonts FONT_INSTALL_DIR=%{buildroot}%{_datadir}/ghostscript/fonts
install -d -m755 $FONT_INSTALL_DIR install -d -m755 $FONT_INSTALL_DIR
install -m644 fonts/fonts.* $FONT_INSTALL_DIR install -m644 fonts/fonts.* $FONT_INSTALL_DIR
for S in afm gsf pfa pfb pfm for SUFFIX in afm gsf pfa pfb pfm
do install -m644 fonts/*.$S $FONT_INSTALL_DIR do install -m644 fonts/*.$SUFFIX $FONT_INSTALL_DIR
done done
# Patch the installed ghostscript-fonts-std fonts:
PATCH_FILE=$RPM_SOURCE_DIR/ghostscript-fonts-std-8.11.patch
PFA_FILES="$( grep -o '^+++ .*\.pfa' $PATCH_FILE | cut -s -d ' ' -f2 )"
pushd %{buildroot}%{_datadir}/ghostscript/fonts
for PFA in $PFA_FILES
do t1ascii ${PFA%%.*}.pfb >$PFA
done
patch -p0 -i $PATCH_FILE
for PFA in $PFA_FILES
do t1binary $PFA > ${PFA%%.*}.pfb
rm -vf $PFA
done
popd
# Provide a link to make the Ghostscript fonts also appear in the directory # Provide a link to make the Ghostscript fonts also appear in the directory
# /usr/share/fonts/ where applications (including X11) search for fonts. # /usr/share/fonts/ where applications (including X11) search for fonts.
# A usr/share/fonts/ sub-directory does not exist in the buildroot: # A usr/share/fonts/ sub-directory does not exist in the buildroot: