Author: kasal Update of /cvs/extras/rpms/perl-bioperl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16315 Modified Files: perl-bioperl.spec Log Message: - use the new filtering macros Index: perl-bioperl.spec =================================================================== RCS file: /cvs/extras/rpms/perl-bioperl/devel/perl-bioperl.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- perl-bioperl.spec 12 Nov 2009 04:09:42 -0000 1.23 +++ perl-bioperl.spec 17 Nov 2009 16:39:47 -0000 1.24 @@ -1,6 +1,6 @@ Name: perl-bioperl Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl tools for computational molecular biology Group: Development/Libraries @@ -54,6 +54,14 @@ BuildRequires: perl(GraphViz) #BuildRequires: perl(Algorithm::Munkres) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# 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 +#%%filter_from_requires /perl(Bio::Tools::Run::/d +#%%?perl_default_filter + %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 @@ -69,20 +77,8 @@ many modules depend on each other to ach rm -r Bio/PhyloNetwork* rm -r t/Tree/PhyloNetwork -# these are the unwanted Requires for perl-bioperl-run, keeping in -# case we need to do the temporary hack for bootstrapping again - -#cat << \EOF > %{_builddir}/BioPerl-%{version}/%{name}-req -##!/bin/sh -#%{__perl_requires} $* |\ -# sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d' -#EOF - -#%%define __perl_requires %{_builddir}/BioPerl-%{version}/%{name}-req -#chmod +x %{__perl_requires} - # remove all execute bits from the doc stuff -find examples -type f -exec chmod -x {} 2>/dev/null ';' +find examples -type f -exec chmod -x {} ';' %build %{__perl} Build.PL --installdirs vendor << EOF @@ -131,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Nov 12 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 1.6.1-2 +- use the new filtering macros (cf #537138) + * Wed Nov 4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.6.1-1 - Update to latest upstream 1.6.1 - Add BR: perl(XML::Simple), perl(DBD:SQLite) for new modules -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl Fedora-perl-devel-list mailing list Fedora-perl-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-perl-devel-list