diff --git a/macros.perl b/macros.perl index f949cd4..5b9dad0 100644 --- a/macros.perl +++ b/macros.perl @@ -27,12 +27,12 @@ %perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor %perl_process_packlist(n:) \ mkdir -p $RPM_BUILD_ROOT/var/adm/perl-modules \ - test -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod && { sed -e "s@$RPM_BUILD_ROOT@@g" < $RPM_BUILD_RO -OT%{perl_archlib}/perllocal.pod > $RPM_BUILD_ROOT/var/adm/perl-modules/%{-n:%{-n*}}%{!-n:%{name}} ; } ; \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT/%perl_sitearch/auto && find $RPM_BUILD_ROOT/%perl_sitea -rch/auto -name .packlist -print0 | xargs -0 -r perl -spi -e "s@$RPM_BUILD_ROOT@@g" ; \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT/%perl_vendorarch/auto && find $RPM_BUILD_ROOT/%perl_ven -dorarch/auto -name .packlist -print0 | xargs -0 -r perl -spi -e "s@$RPM_BUILD_ROOT@@g" ; \ + test -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod && \ + { sed -e "s@$RPM_BUILD_ROOT@@g" < $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod > $RPM_BUILD_ROOT/var/adm/perl-modules/%{-n:%{-n*}}%{!-n:%{name}} ; } ; \ + test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT/%perl_sitearch/auto && \ + find $RPM_BUILD_ROOT/%perl_sitearch/auto -name .packlist -print0 | xargs -0 -r perl -spi -e "s@$RPM_BUILD_ROOT@@g" ; \ + 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 perl -spi -e "s@$RPM_BUILD_ROOT@@g" ; \ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ %nil diff --git a/perl.changes b/perl.changes index 489a7f5..ef22f83 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 7 15:55:54 CEST 2009 - coolo@novell.com + +- disable as-needed as it breaks at least make test + +------------------------------------------------------------------- +Tue Jul 7 12:10:14 CEST 2009 - coolo@novell.com + +- fix macros file + ------------------------------------------------------------------- Mon Jun 29 22:32:43 CEST 2009 - chris@computersalat.de diff --git a/perl.spec b/perl.spec index 3ba6627..23472cf 100644 --- a/perl.spec +++ b/perl.spec @@ -21,7 +21,7 @@ Name: perl Summary: The Perl interpreter Version: 5.10.0 -Release: 68 +Release: 69 License: Artistic License .. ; GPL v2 or later Group: Development/Languages/Perl AutoReqProv: on @@ -152,6 +152,7 @@ cp -p %{S:3} . %patch12 %build +export SUSE_ASNEEDED=0 options="-Doptimize='$RPM_OPT_FLAGS -Wall -pipe'" %ifarch alpha # -mieee needed for bad alpha gcc optimization @@ -174,6 +175,7 @@ make %ifnarch %arm %check +export SUSE_ASNEEDED=0 # delete broken File::Find test rm -f lib/File/Find/t/find.t # delete racy test