[perl-Kwiki-NewPage] fix for RPM4.9, use better filter

Marcela Mašláňová mmaslano at fedoraproject.org
Tue Feb 15 09:58:46 UTC 2011


commit 2b74d4ebe23c9c8b050f56507b3749c85ff39c7b
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Feb 15 10:58:35 2011 +0100

    fix for RPM4.9, use better filter

 perl-Kwiki-NewPage.spec |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/perl-Kwiki-NewPage.spec b/perl-Kwiki-NewPage.spec
index c7ca1da..1b23756 100644
--- a/perl-Kwiki-NewPage.spec
+++ b/perl-Kwiki-NewPage.spec
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-NewPage
 Version:        0.12
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Kwiki New Page Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,26 +14,24 @@ BuildRequires:  perl(Kwiki) >= 0.34
 Requires:       perl(Kwiki) >= 0.34
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-Source98:       Kwiki-NewPage-filter-requires.sh
-%global real_perl_requires %{__perl_requires}
-%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
-
 %description
 Kwiki New Page plugin.
 
+%{?perl_default_filter}
+
 %prep
 %setup -q -n Kwiki-NewPage-%{version}
 
-sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
-chmod +x %{__perl_requires}
+%{?filter_setup:
+%filter_from_requires /^perl(mixin)$/d
+%filter_setup
+}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 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 {} \;
@@ -44,9 +42,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT %{__perl_requires}
-
 %files
 %defattr(-,root,root,-)
 %doc Changes README
@@ -54,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.12-15
+- fix for RPM4.9, use better filter
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 



More information about the perl-devel mailing list