[perl-bioperl] Break cycle on bootstrapping perl

Petr Pisar ppisar at fedoraproject.org
Wed Jul 4 09:30:44 UTC 2012


commit e0be79093e6c544fcde3bd089c0f1c3b2ae142df
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Jul 4 11:17:46 2012 +0200

    Break cycle on bootstrapping perl

 perl-bioperl.spec |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/perl-bioperl.spec b/perl-bioperl.spec
index 99c79ae..4570bc0 100644
--- a/perl-bioperl.spec
+++ b/perl-bioperl.spec
@@ -54,31 +54,22 @@ BuildRequires:  perl(GraphViz)
 #BuildRequires:	perl(Algorithm::Munkres)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# Filter unwanted dependency
+%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(Bio::Expression::FeatureSet\\)
+
 # Packages perl-bioperl and perl-bioperl-run require each other.  To break
 # this circular edependency (e.g., for bootstrapping), filter out all
 # Bio::Tools::Run::* module requirements; they are either self-satisfied
 # (and thus redundant) or they bring dependency on perl-bioperl-run.
-## be careful when commenting this out: macros are expanded even in comments
-# RPM 4.8 style
-#%%filter_from_requires /perl(Bio::Tools::Run::/d
-#%%?perl_default_filter
-# RPM 4.9 style
-#%%global __requires_exclude %%{?__requires_exclude?__requires_exclude|}perl\\(Bio::Tools::Run::
+%if %{defined perl_bootstrap}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Bio::Tools::Run::
+%endif
 
 %description
 BioPerl is a toolkit of Perl modules useful in building bioinformatics
 solutions in Perl. It is built in an object-oriented manner so that
 many modules depend on each other to achieve a task.
 
-
-# RPM 4.8 style
-%{?filter_setup:
-%filter_from_requires /perl(Bio::Expression::FeatureSet)/d
-%{?perl_default_filter}
-}
-# RPM 4.9 style
-%global __requires_exclude %{?__requires_exclude:__requires_exclude|}perl\\(Bio::Expression::FeatureSet\\)
-
 %prep
 %setup -q -n BioPerl-%{version}
 %patch0 -p1 
@@ -141,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jul 03 2012 Petr Pisar <ppisar at redhat.com> - 1.6.1-12
 - Perl 5.16 rebuild
+- Break cycle on bootstrapping perl
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list