From d3df84e57153c7e146d3b280ab6bc56d76dd5e914ea305aa773c3d1911be072a Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 27 Apr 2018 06:48:59 +0000 Subject: [PATCH 1/2] Accepting request 601817 from home:MargueriteSu:branches:M17N:fonts - fix factory build OBS-URL: https://build.opensuse.org/request/show/601817 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/ghostscript-fonts-grops?expand=0&rev=12 --- ghostscript-fonts-grops.changes | 5 +++++ ghostscript-fonts-grops.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ghostscript-fonts-grops.changes b/ghostscript-fonts-grops.changes index 2fb767e..111416e 100644 --- a/ghostscript-fonts-grops.changes +++ b/ghostscript-fonts-grops.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 06:47:46 UTC 2018 - i@marguerite.su + +- fix factory build + ------------------------------------------------------------------- Thu Dec 10 16:25:12 UTC 2015 - schwab@suse.de diff --git a/ghostscript-fonts-grops.spec b/ghostscript-fonts-grops.spec index ba0f76b..a8b8627 100644 --- a/ghostscript-fonts-grops.spec +++ b/ghostscript-fonts-grops.spec @@ -30,6 +30,9 @@ Source2: zzz-groff-gs.csh BuildArch: noarch BuildRequires: fontforge BuildRequires: ghostscript +%if 0%{?suse_version} > 1320 +BuildRequires: ghostscript-fonts-std +%endif BuildRequires: groff-full %requires_eq groff @@ -41,8 +44,9 @@ A version of PostScript® driver for Groff to support characters outside ISO Lat %build %define gs_fonts %{_datadir}/ghostscript/fonts %define import_font() ln -s -T "%{gs_fonts}/%1.afm" "%2.afm" && pfbtopfa "%{gs_fonts}/%1.pfb" "devps/%1.pfa" - -cp -t. '%{_datadir}'/ghostscript/*/doc/COPYING +%define gs_version %(gs --version) +%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 -t. %{gs_docdir}/COPYING mkdir devps while read fn fa # Grops font generator expects conventional font file names; From 76435f09541308201d80fd3707114b5b99b1b879ab280d99528217bc353a7601 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 27 Apr 2018 07:03:59 +0000 Subject: [PATCH 2/2] Accepting request 601822 from home:MargueriteSu:branches:M17N:fonts - expand groff_version macro OBS-URL: https://build.opensuse.org/request/show/601822 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/ghostscript-fonts-grops?expand=0&rev=13 --- ghostscript-fonts-grops.changes | 5 +++++ ghostscript-fonts-grops.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/ghostscript-fonts-grops.changes b/ghostscript-fonts-grops.changes index 111416e..939ec8c 100644 --- a/ghostscript-fonts-grops.changes +++ b/ghostscript-fonts-grops.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 07:03:13 UTC 2018 - i@marguerite.su + +- expand groff_version macro + ------------------------------------------------------------------- Fri Apr 27 06:47:46 UTC 2018 - i@marguerite.su diff --git a/ghostscript-fonts-grops.spec b/ghostscript-fonts-grops.spec index a8b8627..a0d8ca7 100644 --- a/ghostscript-fonts-grops.spec +++ b/ghostscript-fonts-grops.spec @@ -70,6 +70,7 @@ echo "${fn}" "${pf}" done >>devps/download %install +%define groff_version %(groff -v | head -n 1 | sed 's/.*\s//') target="%{buildroot}%{_datadir}/groff/%{groff_version}/font/gs" install -d "${target}" mv "-t${target}" devps