#3 use NimbusSans-Bold font in test instead of phvr
Merged 3 years ago by spot. Opened 3 years ago by zdohnal.
rpms/ zdohnal/perl-Font-AFM rawhide  into  rawhide

file modified
+13 -5
@@ -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
@@ -15,15 +15,20 @@ 

  BuildRequires:  perl-generators

  BuildRequires:  perl(Carp)

  BuildRequires:  perl(ExtUtils::MakeMaker)

- BuildRequires:	%{_datadir}/a2ps/afm/phvr.afm

+ 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 +41,7 @@ 

  

  

  %check

- make test METRICS=%{_datadir}/a2ps/afm

+ make test METRICS=%{_fontbasedir}/urw-base35

  

  

  %files
@@ -45,6 +50,9 @@ 

  %{_mandir}/man3/Font*

  

  %changelog

+ * Fri Mar 19 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.20-36

+ - use NimbusSans-Bold font in test instead of phvr

+ 

  * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-35

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

  

The reason of this PR is described in PR#1. I changed the PR based on @corsepiu's feedback.

Would you mind merging it into rawhide and F34?

Pull-Request has been merged by spot

3 years ago
Metadata