From c9d7b8c29d1a0bfd8e32e01b81589c93068006c2 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Fri, 28 Aug 2009 05:39:58 +0000 Subject: [PATCH] - fix macros.perl *sigh* --- macros.perl | 13 +++++++------ perl.spec | 5 ++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/macros.perl b/macros.perl index a5454ae..b8fc66b 100644 --- a/macros.perl +++ b/macros.perl @@ -1,21 +1,22 @@ -# Sensible Perl-specific RPM build macros +# Sensible Perl-specific RPM build macros. # # Note that these depend on the generic filtering system being in place in -# rpm core. +# rpm core; but won't cause a build to fail if they're not present. # # Chris Weyl 2009 # By default, for perl packages we want to filter all files in _docdir from # req/prov scanning, as well as filtering out any provides caused by private -# libs in vendorarch/archlib (vendor/core) +# libs in vendorarch/archlib (vendor/core). # -# This should also give a good sense of how to use these macros. +# Note that this must be invoked in the spec file, preferably as +# "%{?perl_default_filter}", before any %description block. -%define perl_default_filter %{expand: \ +%perl_default_filter %{?filter_setup: %{expand: \ %filter_provides_in %{perl_vendorarch}/.*\\.so$ \ %filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \ %filter_provides_in %{_docdir} \ %filter_requires_in %{_docdir} \ %filter_setup \ -} +}} diff --git a/perl.spec b/perl.spec index 001a7a4..7acd6d5 100644 --- a/perl.spec +++ b/perl.spec @@ -7,7 +7,7 @@ Name: perl Version: %{perl_version} -Release: 80%{?dist} +Release: 81%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -1939,6 +1939,9 @@ TMPDIR="$PWD/tmp" make test # Old changelog entries are preserved in CVS. %changelog +* Thu Aug 27 2009 Chris Weyl - 4:5.10.0-81 +- fix macros.perl *sigh* + * Mon Aug 24 2009 Stepan Kasal - 4:5.10.0-80 - Remove -DDEBUGGING=-g, we are not ready yet.