From bb35cb30295baaf2755396b60238f60a54e5f10b8dbdd2378946ab636b535a4d Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Wed, 4 Oct 2023 08:48:40 +0000 Subject: [PATCH] Accepting request 1115540 from home:MargueriteSu:branches:M17N:fonts - starting from groff 1.23.0, font/devps/generate/Makefile changed '$@' to '$(OUTDIR)/$@'. then we have to set outdir, or 'AB' will be changed to '/AB' then throw a not writtable error. - upstream typo font/devps/generate/zapfdr.sed to apfdr.sed in generate/Makefile by mistake so we can't link generate directory (hope to be fixed next rel) OBS-URL: https://build.opensuse.org/request/show/1115540 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/ghostscript-fonts-grops?expand=0&rev=21 --- ghostscript-fonts-grops.changes | 11 +++++++ ghostscript-fonts-grops.spec | 56 ++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/ghostscript-fonts-grops.changes b/ghostscript-fonts-grops.changes index dbdcbf1..2240362 100644 --- a/ghostscript-fonts-grops.changes +++ b/ghostscript-fonts-grops.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 4 06:00:04 UTC 2023 - Marguerite Su + +- starting from groff 1.23.0, font/devps/generate/Makefile changed + '$@' to '$(OUTDIR)/$@'. + then we have to set outdir, or 'AB' will be changed to '/AB' + then throw a not writtable error. +- upstream typo font/devps/generate/zapfdr.sed to apfdr.sed + in generate/Makefile by mistake + so we can't link generate directory (hope to be fixed next rel) + ------------------------------------------------------------------- Mon Feb 1 10:13:58 UTC 2021 - Andreas Schwab diff --git a/ghostscript-fonts-grops.spec b/ghostscript-fonts-grops.spec index ecae0f6..b757fd3 100644 --- a/ghostscript-fonts-grops.spec +++ b/ghostscript-fonts-grops.spec @@ -1,7 +1,7 @@ # # spec file for package ghostscript-fonts-grops # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,25 +19,25 @@ Name: ghostscript-fonts-grops Version: 1.22.2 Release: 0 -URL: http://www.gnu.org/software/groff/groff.html Summary: Ghostscript fonts imported to groff for use with grops License: GPL-2.0-only Group: Productivity/Publishing/Troff -Provides: locale(groff:pl) +URL: https://www.gnu.org/software/groff/groff.html Source: gsalias.txt Source1: zzz-groff-gs.sh Source2: zzz-groff-gs.csh # In version 9.26, the ghostscript package doesn't provide a COPYING file # anymore. So providing it: Source3: COPYING -BuildArch: noarch BuildRequires: fontforge BuildRequires: ghostscript +BuildRequires: groff-full +%requires_eq groff +Provides: locale(groff:pl) +BuildArch: noarch %if 0%{?suse_version} > 1320 BuildRequires: ghostscript-fonts-std %endif -BuildRequires: groff-full -%requires_eq groff %description A version of PostScript® driver for Groff to support characters outside ISO Latin 1 character set. @@ -48,12 +48,12 @@ A version of PostScript® driver for Groff to support characters outside ISO Lat %define gs_fonts %{_datadir}/ghostscript/fonts %define gs_version %(gs --version) %if %{lua:print(rpm.vercmp(rpm.expand("%{gs_version}"), "9.50"))} >= 0 -%define import_font() ln -s -T "%{gs_fonts}/%1.afm" "%2.afm" && gs -P- -dNOSAFER -dNODISPLAY -- pfbtopfa.ps %{gs_fonts}/%1.pfb devps/%1.pfa +%define import_font() ln -s -T "%{gs_fonts}/%{1}.afm" "%{2}.afm" && gs -P- -dNOSAFER -dNODISPLAY -- pfbtopfa.ps %{gs_fonts}/%{1}.pfb devps/%{1}.pfa %else -%define import_font() ln -s -T "%{gs_fonts}/%1.afm" "%2.afm" && pfbtopfa %{gs_fonts}/%1.pfb devps/%1.pfa +%define import_font() ln -s -T "%{gs_fonts}/%{1}.afm" "%{2}.afm" && pfbtopfa %{gs_fonts}/%{1}.pfb devps/%{1}.pfa %endif %define gs_docdir %(if [ -d "%{_datadir}/ghostscript/%{gs_version}/doc" ] ; then echo "%{_datadir}/ghostscript/%{gs_version}/doc" ; else echo "%{_datadir}/doc/ghostscript/%{gs_version}"; fi) -cp %{S:3} . +cp %{SOURCE3} . mkdir devps while read fn fa # Grops font generator expects conventional font file names; @@ -62,10 +62,31 @@ while read fn fa # Ghostscript substitutes stripped fonts, full fonts must be embedded in the printout. # Groff only knows how to embed PFA fonts. do %{import_font $fn $fa} -done < '%{S:0}' +done < '%{SOURCE0}' cd devps -ln -s -t. '%{_datadir}/groff/current/font/devps/generate' -make -fgenerate/Makefile afmdir=.. +#ln -s -t. '%{_datadir}/groff/current/font/devps/generate' +mkdir output +mkdir generate +cp -r %{_datadir}/groff/current/font/devps/generate/* ./generate +cp %{_datadir}/groff/current/font/devps/DESC . +cp %{_datadir}/groff/current/font/devps/text.enc . +cp %{_datadir}/groff/current/font/devps/symbolsl.ps . +cp ./generate/zapfdr.sed ./generate/apfdr.sed +if [ -f %{_datadir}/groff/current/font/devps/symbolsl.afm ]; then +cp %{_datadir}/groff/current/font/devps/symbolsl.afm output/ +cp %{_datadir}/groff/current/font/devps/zapfdr.afm output/ +fi +cp %{_datadir}/groff/current/font/devps/freeeuro.afm . +ln -sf output/symbol.afm . +make -fgenerate/Makefile afmdir=.. \ + OUTDIR=output +if [ -h symbol.afm ]; then + rm symbol.afm + for f in output/* ; do + cp ${f} . + done +fi +rm -rf output # Register fonts to be embedded cd .. for f in *.afm @@ -81,14 +102,13 @@ done >>devps/download target="%{buildroot}%{_datadir}/groff/%{groff_version}/font/gs" install -d "${target}" mv "-t${target}" devps -mkdir -p %{buildroot}/etc/profile.d -install -c -m 0644 %{S:1} %{buildroot}/etc/profile.d -install -c -m 0644 %{S:2} %{buildroot}/etc/profile.d +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -c -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d +install -c -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d %files -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_datadir}/* -%config /etc/profile.d/* +%config %{_sysconfdir}/profile.d/* %changelog