From 7e17968ce7dac8d5afd8d08160712a0e1012a039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 28 Nov 2012 15:05:33 +0100 Subject: [PATCH] BuildRequire Carp and fix the License tag --- perl-Font-AFM.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/perl-Font-AFM.spec b/perl-Font-AFM.spec index d10f936..fdfe329 100644 --- a/perl-Font-AFM.spec +++ b/perl-Font-AFM.spec @@ -1,19 +1,20 @@ Name: perl-Font-AFM Version: 1.20 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Perl interface to Adobe Font Metrics files Group: Development/Libraries -License: GPL+ or Artistic +License: (GPL+ or Artistic) and Copyright only URL: http://search.cpan.org/dist/Font-AFM/ Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Font-AFM-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) BuildArch: noarch +BuildRequires: perl(Carp) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: %{_datadir}/a2ps/afm/phvr.afm @@ -26,15 +27,14 @@ Interface to Adobe Font Metrics files sed -i -e 's,Helvetica,phvr,g' t/afm.t %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +make pure_install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -52,6 +52,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Font* %changelog +* Wed Nov 28 2012 Petr Šabata - 1.20-12 +- BuildRequire perl(Carp) +- Drop command macros +- Reflect metrics copyright in the License tag + * Fri Jul 20 2012 Fedora Release Engineering - 1.20-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild