From e96f2c62e14f7fad91ff0ffbc3c65f074f8119ac83fcffc551cd50e5ab3c5a9d Mon Sep 17 00:00:00 2001 From: Matwey Kornilov Date: Thu, 23 Nov 2017 20:14:46 +0000 Subject: [PATCH] Accepting request 544782 from home:RBrownSUSE:branches:devel:languages:erlang:Factory Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544782 OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang:Factory/erlang?expand=0&rev=58 --- erlang.changes | 6 ++++++ erlang.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/erlang.changes b/erlang.changes index 502bd53..db3785d 100644 --- a/erlang.changes +++ b/erlang.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:49:29 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Oct 19 10:40:11 UTC 2017 - matwey.kornilov@gmail.com diff --git a/erlang.spec b/erlang.spec index b2a1d7e..e47548f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %if 0%{?rhel} >= 7 %undefine _missing_build_ids_terminate_build %endif @@ -413,7 +418,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcepmd ln -s /etc/init.d/epmd %{buildroot}%{_sbindir}/rcepmd %endif install -D -m 0755 %{S:4} %{buildroot}/etc/init.d/epmd -install -D -m 0644 %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.erlang +install -D -m 0644 %{S:5} %{buildroot}%{_fillupdir}/sysconfig.erlang install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang %pre epmd @@ -550,7 +555,7 @@ getent passwd epmd || /usr/sbin/useradd -g epmd -s /bin/false -r -c "Erlang Port %endif /etc/init.d/epmd %{_sbindir}/rcepmd -/var/adm/fillup-templates/sysconfig.erlang +%{_fillupdir}/sysconfig.erlang %files jinterface %defattr(-,root,root,-)