Make %global perl_default_filter lazy

This commit is contained in:
Petr Písař 2011-01-26 19:04:53 +01:00
parent 2ba49d6038
commit c99b79b95b

View File

@ -8,11 +8,11 @@
%global tapsetdir %{_datadir}/systemtap/tapset %global tapsetdir %{_datadir}/systemtap/tapset
# internal filter just for this spec # internal filter just for this spec
# XXX: perl_default_filter as %%global does not work. Why? # XXX: %%global expands now, archlib must be pre-defined.
%define perl_default_filter %{?filter_setup: %{expand: \ %global perl_default_filter %%{?filter_setup: %%{expand: \
%filter_provides_in -P %{archlib}/(?!CORE/libperl).*\\.so$ \ %%filter_provides_in -P %%{archlib}/(?!CORE/libperl).*\\.so$ \
%filter_from_provides /perl(UNIVERSAL)/d; /perl(DB)/d \ %%filter_from_provides /perl(UNIVERSAL)/d; /perl(DB)/d \
%filter_setup \ %%filter_setup \
}} }}
# same as we provide in /etc/rpm/macros.perl # same as we provide in /etc/rpm/macros.perl
@ -1893,7 +1893,7 @@ rm -rf $RPM_BUILD_ROOT
# Old changelog entries are preserved in CVS. # Old changelog entries are preserved in CVS.
%changelog %changelog
* Wed Jan 26 2011 Petr Pisar <ppisar@redhat.com> - 4:5.12.3-150 * Wed Jan 26 2011 Petr Pisar <ppisar@redhat.com> - 4:5.12.3-150
- Do not %global perl_default_filter - Make %%global perl_default_filter lazy
- Do not hard-code tapsetdir path - Do not hard-code tapsetdir path
* Tue Jan 25 2011 Lukas Berk <lberk@redhat.com> - 4:5.12.3-149 * Tue Jan 25 2011 Lukas Berk <lberk@redhat.com> - 4:5.12.3-149