[perl-Kwiki/f15/master] - Switch to using perl-filters/Abandon filter-requires.sh (Work around broken deps caused by rpm d

corsepiu corsepiu at fedoraproject.org
Tue Feb 15 09:59:26 UTC 2011


commit 76b7f71de9fc10590629442268479f4a54cfed45
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Feb 15 10:59:15 2011 +0100

    - Switch to using perl-filters/Abandon filter-requires.sh
      (Work around broken deps caused by rpm dep-tracker changes).
    - BR: perl-IO-All, to assure getting the right perl(IO::All)
      (was bogusly provided by perl-Spoon-0.24-9).

 Kwiki-filter-requires.sh |    3 ---
 perl-Kwiki.spec          |   23 +++++++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/perl-Kwiki.spec b/perl-Kwiki.spec
index a2599bd..1476898 100644
--- a/perl-Kwiki.spec
+++ b/perl-Kwiki.spec
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki
 Version:        0.39
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Kwiki Wiki Building Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,11 +12,15 @@ BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Spoon) >= 0.22
+# TEMPORARY HACK: Force inclusion of perl-IO-All
+BuildRequires:  perl-IO-All
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-Source98:       Kwiki-filter-requires.sh
-%global real_perl_requires %{__perl_requires}
-%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+%{?filter_setup:
+%filter_from_requires /^perl(mixin)/d
+%{?perl_default_filter}
+}
 
 %description
 A Wiki is a website that allows its users to add pages, and edit any
@@ -39,9 +43,6 @@ plugins available, this will hopefully be the case.
 %prep
 %setup -q -n Kwiki-%{version}
 
-sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -60,7 +61,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT %{__perl_requires}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
@@ -71,6 +72,12 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 15 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.39-11
+- Switch to using perl-filters/Abandon filter-requires.sh
+  (Work around broken deps caused by rpm dep-tracker changes).
+- BR: perl-IO-All, to assure getting the right perl(IO::All)
+  (was bogusly provided by perl-Spoon-0.24-9).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.39-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 



More information about the perl-devel mailing list