From 0dd7cbfaf2d0bbbb77200d93043a267f1d1022d2 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 8 Apr 2021 17:23:20 +0200 Subject: [PATCH] Resolves: #1940802 --- perl-Font-AFM.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/perl-Font-AFM.spec b/perl-Font-AFM.spec index 86efb1a..392cafe 100644 --- a/perl-Font-AFM.spec +++ b/perl-Font-AFM.spec @@ -1,6 +1,6 @@ Name: perl-Font-AFM Version: 1.20 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Perl interface to Adobe Font Metrics files License: (GPL+ or Artistic) and Copyright only @@ -11,19 +11,27 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch -BuildRequires: make +BuildRequires: coreutils +BuildRequires: make BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(Carp) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: %{_datadir}/a2ps/afm/phvr.afm +BuildRequires: sed +BuildRequires: %{_fontbasedir}/urw-base35/NimbusSans-Bold.afm %description Interface to Adobe Font Metrics files %prep %setup -q -n Font-AFM-%{version} -# We don't have Helvetica, use phvr.afm instead -sed -i -e 's,Helvetica,phvr,g' t/afm.t +# We don't have Helvetica, use NimbusSans-Bold.afm instead +sed -i -e 's,Helvetica,NimbusSans-Bold,g' t/afm.t +# Change the expected string width to match NimbusSans-Bold. +# 4558 is a sum of widths of characters from testing 'Gisle Aas' string +# in NimbusSans-Bold - see NimbusSans-Bold.afm for specific character +# length. +sed -i -e 's,4279,4558,g' t/afm.t %build %{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 @@ -36,7 +44,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* %check -make test METRICS=%{_datadir}/a2ps/afm +make test METRICS=%{_fontbasedir}/urw-base35 %files @@ -45,6 +53,9 @@ make test METRICS=%{_datadir}/a2ps/afm %{_mandir}/man3/Font* %changelog +* Fri Mar 19 2021 Zdenek Dohnal - 1.20-36 +- use NimbusSans-Bold font in test instead of phvr (bug #1940802) + * Wed Jan 27 2021 Fedora Release Engineering - 1.20-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild