Accepting request 544763 from home:RBrownSUSE:branches:Virtualization

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544763
OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=42
This commit is contained in:
Dirk Mueller 2017-11-24 09:58:09 +00:00 committed by Git OBS Bridge
parent 9e6162062e
commit c2aea8bfbf
2 changed files with 15 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:47:59 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Jun 7 22:39:48 UTC 2017 - jfehlig@suse.com

View File

@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define with_fence_sanlockd 0
%define with_sanlk_reset 0
@ -162,8 +167,8 @@ make -C reset \
%endif
install -D -m 644 src/sanlock.conf %{buildroot}/%{_sysconfdir}/sanlock/sanlock.conf
install -D -m 644 %SOURCE1 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
install -D -m 644 %SOURCE2 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
install -D -m 644 %SOURCE1 %{buildroot}/%{_fillupdir}/sysconfig.sanlock
install -D -m 644 %SOURCE2 %{buildroot}/%{_fillupdir}/sysconfig.wdmd
install -D -m 644 init.d/sanlock.service %{buildroot}/%{_unitdir}/sanlock.service
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsanlock
@ -246,9 +251,9 @@ install -Dd -m 0755 %{buildroot}/etc/wdmd.d
%dir %attr(0700, root, root) %{_sysconfdir}/sanlock/
%config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf
%{_sbindir}/rcsanlock
%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
%{_fillupdir}/sysconfig.sanlock
%{_sbindir}/rcwdmd
%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
%{_fillupdir}/sysconfig.wdmd
%{_unitdir}/sanlock.service
%{_unitdir}/wdmd.service
%{_sbindir}/sanlock