[perl-Sort-Key] clean up spec for modern rpmbuild

Iain Arnell iarnell at fedoraproject.org
Sun Jul 29 16:36:44 UTC 2012


commit a44f94ac23e8fb08be656247c37e14cef592c86f
Author: Iain Arnell <iarnell at gmail.com>
Date:   Sun Jul 29 10:32:33 2012 -0600

    clean up spec for modern rpmbuild

 perl-Sort-Key.spec |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/perl-Sort-Key.spec b/perl-Sort-Key.spec
index 43c5043..77d7de5 100644
--- a/perl-Sort-Key.spec
+++ b/perl-Sort-Key.spec
@@ -6,7 +6,6 @@ License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Sort-Key/
 Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Sort-Key-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More) >= 0.54
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -29,24 +28,17 @@ calculated key value.
 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 f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/Sort*
@@ -55,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Jul 29 2012 Iain Arnell <iarnell at gmail.com> 1.32-1
 - update to latest upstream version
+- clean up spec for modern rpmbuild
 
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.28-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild


More information about the scm-commits mailing list