rpms/perl/devel macros.perl,1.1,1.2 perl.spec,1.230,1.231

[Chris Weyl]

Author: cweyl

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7034

Modified Files:
	macros.perl perl.spec 
Log Message:
* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
- fix macros.perl *sigh*



Index: macros.perl
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/macros.perl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- macros.perl	23 Aug 2009 18:16:14 -0000	1.1
+++ macros.perl	28 Aug 2009 05:39:58 -0000	1.2
@@ -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 <cweyl at alumni.drew.edu> 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 \
-}
+}}
 


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- perl.spec	24 Aug 2009 12:38:39 -0000	1.230
+++ perl.spec	28 Aug 2009 05:39:58 -0000	1.231
@@ -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 <cweyl at alumni.drew.edu> - 4:5.10.0-81
+- fix macros.perl *sigh*
+
 * Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-80
 - Remove -DDEBUGGING=-g, we are not ready yet.