From 8f7474e1155e90a3e3b95c90204e977b0599eec1b9756a9024ca188fe100f17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 8 Dec 2017 15:39:03 +0000 Subject: [PATCH] Accepting request 544887 from home:RBrownSUSE:branches:devel:languages:perl Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544887 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=155 --- perl.changes | 6 ++++++ perl.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/perl.changes b/perl.changes index 777f3ee..7625e80 100644 --- a/perl.changes +++ b/perl.changes @@ -3,6 +3,12 @@ Mon Dec 4 17:50:10 UTC 2017 - bwiedemann@suse.com - Add perl-reproducible.patch to make build reproducible (boo#1047218) +------------------------------------------------------------------- +Thu Nov 23 13:43:59 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Sat Sep 23 10:40:59 UTC 2017 - coolo@suse.com diff --git a/perl.spec b/perl.spec index 6c4f743..c4c7daa 100644 --- a/perl.spec +++ b/perl.spec @@ -17,6 +17,11 @@ # icecream 0 +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: perl Summary: The Perl interpreter License: Artistic-1.0 or GPL-2.0+ @@ -245,10 +250,10 @@ install -m 444 saveConfig.pm $cpa/Config.pm install -m 444 saveConfig_heavy.pl $cpa/Config_heavy.pl #install -d $RPM_BUILD_ROOT/var/adm/SuSEconfig/bin #install -d $RPM_BUILD_ROOT/sbin/conf.d -#install -d $RPM_BUILD_ROOT/var/adm/fillup-templates +#install -d $RPM_BUILD_ROOT%{_fillupdir} #install -m 755 SuSE/perllocal.SuSE $RPM_BUILD_ROOT/usr/lib/perl5 #install -m 755 SuSE/SuSEconfig.perl $RPM_BUILD_ROOT/sbin/conf.d -#install -m 755 SuSE/sysconfig.suseconfig-perl $RPM_BUILD_ROOT/var/adm/fillup-templates +#install -m 755 SuSE/sysconfig.suseconfig-perl $RPM_BUILD_ROOT%{_fillupdir} # install macros.perl file install -D -m 644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.perl pushd /usr/include @@ -415,7 +420,7 @@ EOF /usr/lib/perl5/* %config %{_sysconfdir}/rpm/macros.perl #/sbin/conf.d/SuSEconfig.perl -#/var/adm/fillup-templates/sysconfig.suseconfig-perl +#%{_fillupdir}/sysconfig.suseconfig-perl #%ghost /usr/lib/perl*/*/*/perllocal.pod #%ghost %doc /usr/share/man/man3/perllocal.3pm.gz