[perl-Module-Util] clean up spec for modern rpmbuild

Iain Arnell iarnell at fedoraproject.org
Sun Jun 10 17:10:51 UTC 2012


commit 4813eaaeb0d060dddacb6b57c3bbde6a7a96838e
Author: Iain Arnell <iarnell at gmail.com>
Date:   Sun Jun 10 10:55:32 2012 -0600

    clean up spec for modern rpmbuild

 perl-Module-Util.spec |   25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)
---
diff --git a/perl-Module-Util.spec b/perl-Module-Util.spec
index a8c16e9..b7a58a1 100644
--- a/perl-Module-Util.spec
+++ b/perl-Module-Util.spec
@@ -7,7 +7,6 @@ Group:      Development/Libraries
 Summary:    Module name tools and transformations
 Source:     http://search.cpan.org/CPAN/authors/id/M/MA/MATTLAW/Module-Util-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/Module-Util
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -15,6 +14,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Module::Build::Compat)
 BuildRequires: perl(Test::More)
 
+%{perl_default_filter}
 
 %description
 This module provides a few useful functions for manipulating module names.
@@ -22,42 +22,23 @@ Its main aim is to centralise some of the functions commonly used by
 modules that manipulate other modules in some way, like converting module
 names to relative paths.
 
-
 %prep
 %setup -q -n Module-Util-%{version}
 
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_provides %{_builddir}/Module-Util-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 
 %{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README t/
 %{perl_vendorlib}/*
 %{_bindir}/*
@@ -66,6 +47,8 @@ rm -rf %{buildroot}
 %changelog
 * Sun Jun 10 2012 Iain Arnell <iarnell at gmail.com> 1.08-1
 - update to latest upstream version
+- clean up spec for modern rpmbuild
+- use perl_default_filter
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list