From febbffad93d20b370abc9499ceb7a28ad733c143 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Thu, 5 Oct 2006 01:26:20 +0000 Subject: [PATCH] - rework spec to use macros - we now require perl(Readonly::XS) --- perl-Readonly.spec | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/perl-Readonly.spec b/perl-Readonly.spec index 02ce620..a7c3195 100644 --- a/perl-Readonly.spec +++ b/perl-Readonly.spec @@ -1,6 +1,6 @@ Name: perl-Readonly Version: 1.03 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Facility for creating read-only scalars, arrays, hashes Group: Development/Libraries @@ -8,8 +8,12 @@ License: GPL or Artistic URL: http://search.cpan.org/dist/Readonly/ Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch + +# perl-Readonly-XS builds for all current fedora architectures, so let's +# require it. +Requires: perl(Readonly::XS) + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -34,20 +38,24 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl . +rm -rf %{buildroot} + +make pure_install DESTDIR=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' + +%{_fixperms} %{buildroot}/* + +# make sure this goes where it should to be... +mv %{buildroot}%{perl_vendorlib}/benchmark.pl . -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/* %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -58,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 04 2006 Chris Weyl 1.03-6 +- add explict requires on perl(Readonly::XS). perl(Readonly::XS) is available + for all architectures fedora supports, so there's no good reason to not + require it. +- spec file rework + * Tue Sep 19 2006 Chris Weyl 1.03-5 - bump for mass rebuild