diff --git a/macros.perl b/macros.perl index b79d73b..4ec7a2c 100644 --- a/macros.perl +++ b/macros.perl @@ -22,17 +22,24 @@ %perl_installarchlib %(perl -V:installarchlib | sed "s!.*='!!;s!'.*!!") %perl_prefix %{buildroot} +# Macro to encapsulate perl requires (empty for fedora and suse > 11.3) +# we keep the complicated form even here to easy sync the other macros with +# perl-macros package +# +%perl_requires() \ +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1700 \ +Requires: perl = %{perl_version} \ +%endif + # suse specific macros # %perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor %perl_process_packlist(n:) \ - if [ %{_target_cpu} == noarch ]; then \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir ; \ - else \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \ + if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm \ + if [ %{_target_cpu} == noarch ]; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir \ + fi \ fi \ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ %nil diff --git a/perl.changes b/perl.changes index cdd5081..9dd602f 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 30 10:23:06 UTC 2010 - coolo@novell.com + +- added a new macro %perl_requires + +------------------------------------------------------------------- +Mon Nov 29 15:20:19 UTC 2010 - coolo@novell.com + +- simplify macro logic a bit + ------------------------------------------------------------------- Mon Nov 22 19:27:42 UTC 2010 - chris@computersalat.de