From 3e5a5586476ff5888e1636498a2dedadb23ee937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 16 Jan 2015 09:32:01 +0100 Subject: [PATCH] Fix dependency filtering --- perl-DateTime-TimeZone.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/perl-DateTime-TimeZone.spec b/perl-DateTime-TimeZone.spec index 138290b..09fb897 100644 --- a/perl-DateTime-TimeZone.spec +++ b/perl-DateTime-TimeZone.spec @@ -1,6 +1,6 @@ Name: perl-DateTime-TimeZone Version: 1.83 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Time zone object base class and factory License: GPL+ or Artistic Group: Development/Libraries @@ -65,12 +65,11 @@ Requires: perl(DateTime::TimeZone::Tzfile) %endif %?perl_default_filter} -%global __requires_exclude %{__requires_exclude}|perl\\(Params::Validate\\)$|perl\\(Class::Singleton\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((Params::Validate|Class::Singleton)\\)$ %if 0%{?perl_bootstrap} # avoid circular dependencies - DateTime strictly requires DateTime::TimeZone -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(DateTime\\) -%global __requires_exclude %{__requires_exclude}|perl\\(DateTime::Duration\\) +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(DateTime(::Duration)?\\) %endif %description @@ -100,6 +99,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Jan 16 2015 Petr Pisar - 1.83-2 +- Fix dependency filtering + * Wed Jan 07 2015 Petr Šabata - 1.83-1 - 1.83 bump, tests enhanced for 5.21 - Dropping F16-era conflicts