From 108039af6c860d1518e02b4d01e01cc9168246e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 29 Apr 2011 11:39:00 +0200 Subject: [PATCH] Global macros file are updated to work with rpm4.9 Definition taken from: http://rpm.org/wiki/PackagerDocs/DependencyGenerator --- macros.perl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/macros.perl b/macros.perl index 436c49e..9ba91e9 100644 --- a/macros.perl +++ b/macros.perl @@ -4,6 +4,7 @@ # rpm core; but won't cause a build to fail if they're not present. # # Chris Weyl 2009 +# Marcela Mašláňová 2011 # This macro unsets several common vars used to control how Makefile.PL (et # al) build and install packages. We also set a couple to help some of the @@ -27,7 +28,11 @@ export PERL_MM_USE_DEFAULT=1 # keep track of what "revision" of the filtering we're at. Each time we # change the filter we should increment this. -%perl_default_filter_revision 2 +%perl_default_filter_revision 3 + +# Perl provides/requeries are generated by external generators. +%global __perl_provides /usr/lib/rpm/perl.prov +%global __perl_requires /usr/lib/rpm/perl.req # 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 @@ -37,10 +42,8 @@ export PERL_MM_USE_DEFAULT=1 # "%{?perl_default_filter}", before any %description block. %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} \ +%define __provides_exclude_from (%{_perl_vendorarch}\/auto\/*|%{perl_archlib}/(?!CORE/libperl).*)\.so*|%{_docdir} \ +%define __requires_exclude_from %{_docdir} \ %filter_setup \ }}