From 2768b63274d5bcf70aaef0a355a6147f368a4d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corse...@fedoraproject.org>
Date: Wed, 27 Jan 2016 13:22:27 +0100
Subject: Rework filtering.
- Modernize spec.
---
perl-CHI.spec | 55 +++++++++++++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/perl-CHI.spec b/perl-CHI.spec
index 9e0c7b1..f2c6c07 100644
--- a/perl-CHI.spec
+++ b/perl-CHI.spec
@@ -1,6 +1,6 @@
Name: perl-CHI
Version: 0.60
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Unified cache handling interface
License: GPL+ or Artistic
Group: Development/Libraries
@@ -59,22 +59,27 @@ BuildRequires: perl(Cache::FastMmap)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
-%{?perl_filter_default}
-
-%{?filter_setup:
-# Replace unversioned dependencies with versioned ones.
-%filter_from_requires s/^perl(Carp::Assert)$/perl(Carp::Assert) >= 0.20/
-%filter_from_requires s/^perl(List::MoreUtils)$/perl(List::MoreUtils) >= 0.13/
-%filter_from_requires s/^perl(Log::Any)$/perl(Log::Any) >= 0.06/
-%filter_from_requires s/^perl(Time::Duration)$/perl(Time::Duration) >= 1.06/
-%filter_from_requires
s/^perl(Time::Duration::Parse)$/perl(Time::Duration::Parse) >= 0.03/
-%filter_from_requires s/^perl(Time::HiRes)$/perl(Time::HiRes) >= 1.30/
-%filter_setup
-}
-
-%global __provides_exclude
%{?__provides_exclude:__provides_exclude|}^perl\\(Bar\\)
-%global __provides_exclude %__provides_exclude|^perl\\(DummySerializer\\)
-%global __provides_exclude %__provides_exclude|^perl\\(Foo\\)
+# Filter out bogus provides
+%global __provides_exclude
%{?__provides_exclude:%__provides_exclude|}^perl\\(Bar\\)
+%global __provides_exclude
%{?__provides_exclude:%__provides_exclude|}^perl\\(Baz\\)
+%global __provides_exclude
%{?__provides_exclude:%__provides_exclude|}^perl\\(DummySerializer\\)
+%global __provides_exclude
%{?__provides_exclude:%__provides_exclude|}^perl\\(Foo\\)
+
+# Filter out unversioned requires
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\(Carp::Assert\\)$
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\(List::MoreUtils\\)$
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\(Log::Any\\)$
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\(Time::Duration\\)$
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\(Time::Duration::Parse\\)$
+%global __requires_exclude
%{?__requires_exclude:%__requires_exclude|}^perl\\(Time::HiRes\\)$
+
+# ... replace filtered requires with versioned requires
+Requires: perl(Carp::Assert) >= 0.20
+Requires: perl(List::MoreUtils) >= 0.13
+Requires: perl(Log::Any) >= 0.06
+Requires: perl(Time::Duration) >= 1.06
+Requires: perl(Time::Duration::Parse) >= 0.03
+Requires: perl(Time::HiRes) >= 1.30
%description
CHI provides a unified caching API, designed to assist a developer in
@@ -86,8 +91,12 @@ Summary: CHI::Test module
Requires: perl-CHI = %{version}-%{release}
# rpm misses these:
-Requires: perl(Test::Deep)
-Requires: perl(Test::Exception)
+Requires: perl(Test::Deep)
+Requires: perl(Test::Exception)
+
+# ... replace filtered requires with versioned requires
+Requires: perl(List::MoreUtils) >= 0.13
+Requires: perl(Time::HiRes) >= 1.30
%description Test
CHI::Test and CHI::t perl modules
@@ -100,13 +109,11 @@ CHI::Test and CHI::t perl modules
find lib \( -type f -a -executable \) -exec chmod -x {} \;
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps NO_PACKLIST=1
make %{?_smp_mflags}
%install
make pure_install PERL_INSTALL_ROOT=$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/*
@@ -135,6 +142,10 @@ make test %{?with_author_tests:AUTHOR_TESTING=1}
%{?with_smoke_tests:AUTOMATED_T
%{perl_vendorlib}/CHI/Test*
%changelog
+* Wed Jan 27 2016 Ralf Corsépius <corse...@fedoraproject.org> - 0.60-6
+- Rework filtering.
+- Modernize spec.
+
* Sat Aug 15 2015 Ralf Corsépius <corse...@fedoraproject.org> - 0.60-5
- BR: perl(Time::HiRes) (RHBZ#1253321).
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-CHI.git/commit/?h=f23&id=2768b63274d5bcf70aaef0a355a6147f368a4d37
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
