[perl-Ace] clean specfile, use filtering macro

Marcela Mašláňová mmaslano at fedoraproject.org
Tue Feb 15 11:17:52 UTC 2011


commit 9f8084811f1796cac85134ca1a0a826876f91bb1
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Feb 15 12:17:44 2011 +0100

    clean specfile, use filtering macro

 perl-Ace.spec |   28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/perl-Ace.spec b/perl-Ace.spec
index 580436b..61e27af 100644
--- a/perl-Ace.spec
+++ b/perl-Ace.spec
@@ -1,12 +1,11 @@
 Name:           perl-Ace
 Version:        1.92
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Cache::Cache) >= 1.03
@@ -18,25 +17,20 @@ Designed specifically for use in genome sequencing projects, ACEDB
 provides powerful modeling and management services for biological and
 laboratory data.
 
+%{?perl_default_filter}
+
 %prep
 %setup -q -n AcePerl-%{version}
 
+%{?filter_setup:
+%filter_from_requires /perl(Ace::Browser::LocalSiteDefs)$/d
+%filter_setup
+}
 # remove all execute bits from the doc stuff and fix interpreter
 # so that dependency generator doesn't try to fulfill deps
 find examples -type f -exec chmod -x {} 2>/dev/null ';'
 find examples -type f -exec sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' {} 2>/dev/null ';'
 
-# Filter extra requires on Ace::Browser::LocalSiteDefs that isn't
-# needed because we don't currently install the AceBrowser
-cat << \EOF > %{_builddir}/AcePerl-%{version}/%{name}-req
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(Ace::Browser::LocalSiteDefs)$/d'
-EOF
-
-%define __perl_requires %{_builddir}/AcePerl-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" << EOF
 1
@@ -46,8 +40,6 @@ EOF
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -60,9 +52,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %check
 %{?_with_check:make test || :}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %doc examples
@@ -73,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.92-8
+- clean specfile, use filtering macro
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.92-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list