From fe1924ffa2021e16c8c2b7466933c97deda9d975e2414d4680ecf08f63dbb5c8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 20 Nov 2010 10:12:48 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/perl revision 50.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=b8600332026a869708402e6d6f1bf4e0 --- perl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl.spec b/perl.spec index 6b6d4c4..5fbf2c1 100644 --- a/perl.spec +++ b/perl.spec @@ -21,7 +21,7 @@ Name: perl Summary: The Perl interpreter Version: 5.12.2 -Release: 1 +Release: 2 %define pversion 5.12.2 License: Artistic License .. ; GPLv2+ Group: Development/Languages/Perl From 386374dd12045505716bf5241e1d0796e096284a6e187bb7b8d2019bd04a719a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 24 Nov 2010 13:46:54 +0000 Subject: [PATCH 2/2] Accepting request 53704 from home:computersalat:devel:perl mls: "Ich hab's ihm doch vorgeschlagen, er soll sich nicht so anstellen" OBS-URL: https://build.opensuse.org/request/show/53704 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=47 --- macros.perl | 15 ++++++++------- perl.changes | 7 +++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/macros.perl b/macros.perl index e2cab04..b79d73b 100644 --- a/macros.perl +++ b/macros.perl @@ -26,13 +26,14 @@ # %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_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" ; \ + 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 ; \ + fi \ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ %nil diff --git a/perl.changes b/perl.changes index 031e41f..cdd5081 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 22 19:27:42 UTC 2010 - chris@computersalat.de + +- rework process_packlist macro + o remove .packlist, perllocal.pod file + hence no /var/adm/perl-modules/perl-{cpan_name} + ------------------------------------------------------------------- Wed Nov 17 16:40:13 CET 2010 - meissner@suse.de