From b251c5341a108d5785c869e07a7cbe2aa4e96a6a Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Sun, 23 Aug 2009 18:16:14 +0000 Subject: [PATCH] - add helper filtering macros to -devel, for perl-* package invocation (#502402) --- macros.perl | 21 +++++++++++++++++++++ perl.spec | 15 ++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 macros.perl diff --git a/macros.perl b/macros.perl new file mode 100644 index 0000000..a5454ae --- /dev/null +++ b/macros.perl @@ -0,0 +1,21 @@ +# Sensible Perl-specific RPM build macros +# +# Note that these depend on the generic filtering system being in place in +# rpm core. +# +# 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) +# +# This should also give a good sense of how to use these macros. + +%define perl_default_filter %{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 db3c1db..f9de55c 100644 --- a/perl.spec +++ b/perl.spec @@ -7,7 +7,7 @@ Name: perl Version: %{perl_version} -Release: 78%{?dist} +Release: 79%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -18,6 +18,7 @@ Url: http://www.perl.org/ Source0: http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/perl-%{perl_version}.tar.gz Source11: filter-requires.sh Source12: perl-5.8.0-libnet.cfg +Source13: macros.perl # Specific to Fedora/RHEL Patch1: perl-5.8.0-root.patch @@ -1188,6 +1189,13 @@ done # install -p -m 644 %{SOURCE12} %{comp_perl_lib}/Net/libnet.cfg +# +# perl RPM macros +# + +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm +install -p -m 644 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/ + # # Core modules removal # @@ -1630,6 +1638,7 @@ TMPDIR="$PWD/tmp" make test %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h %{_bindir}/xsubpp %{_mandir}/man1/xsubpp* +%{_sysconfdir}/rpm/macros.perl %files suidperl %defattr(-,root,root,-) @@ -1930,6 +1939,10 @@ TMPDIR="$PWD/tmp" make test # Old changelog entries are preserved in CVS. %changelog +* Fri Aug 21 2009 Chris Weyl - 4:5.10.0-79 +- add helper filtering macros to -devel, for perl-* package invocation + (#502402) + * Fri Jul 31 2009 Stepan Kasal - 4:5.10.0-78 - Add configure option -DDEBUGGING=-g (#156113)