From 4fdb37c7beb5c97b9a650893cc6564f4d8149dd5ce07f172b256890c7a528bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 19 Nov 2010 19:57:58 +0000 Subject: [PATCH] Accepting request 53540 from home:computersalat:devel:Base OBS-URL: https://build.opensuse.org/request/show/53540 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=75 --- rpm-suse_macros | 12 ------------ rpm.changes | 6 ++++++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index ab14b81..bde23c6 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -24,18 +24,6 @@ /usr/lib/rpm/brp-symlink \ %{nil}} -# perl_vendorarch is defined -# perl_vendorlib is defined -%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" ; \ - rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ - %nil - # macro: %restart_on_update() # Used to restart a service in postun section, if we are # not running from YaST2 in instsys on update. diff --git a/rpm.changes b/rpm.changes index 335c374..21bfc44 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 19 16:09:20 UTC 2010 - chris@computersalat.de + +- remove perl macro stuff from suse_macros + o provided with perl /etc/rpm/macros.perl + ------------------------------------------------------------------- Tue Nov 16 15:25:45 UTC 2010 - lnussel@suse.de