[perl-Captcha-reCAPTCHA] clean up spec for modern rpmbuild

Iain Arnell iarnell at fedoraproject.org
Sat Aug 18 16:24:29 UTC 2012


commit f8b5481f3937ded0fe94543d18293aa0a9316387
Author: Iain Arnell <iarnell at gmail.com>
Date:   Sat Aug 18 10:23:00 2012 -0600

    clean up spec for modern rpmbuild

 perl-Captcha-reCAPTCHA.spec |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/perl-Captcha-reCAPTCHA.spec b/perl-Captcha-reCAPTCHA.spec
index 3286380..70610ae 100644
--- a/perl-Captcha-reCAPTCHA.spec
+++ b/perl-Captcha-reCAPTCHA.spec
@@ -6,7 +6,6 @@ License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Captcha-reCAPTCHA/
 Source0:        http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # Run-time
@@ -23,6 +22,8 @@ BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 reCAPTCHA is a hybrid mechanical turk and captcha that allows visitors who
 complete the captcha to assist in the digitization of books.
@@ -35,23 +36,16 @@ complete the captcha to assist in the digitization of books.
 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 -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_vendorlib}/*
 %{_mandir}/man3/*
@@ -59,6 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Aug 18 2012 Iain Arnell <iarnell at gmail.com> 0.95-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> - 0.94-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild



More information about the perl-devel mailing list