Accepting request 545093 from Virtualization
OBS-URL: https://build.opensuse.org/request/show/545093 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sanlock?expand=0&rev=16
This commit is contained in:
commit
b4bf2e00fa
@ -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
|
Wed Jun 7 22:39:48 UTC 2017 - jfehlig@suse.com
|
||||||
|
|
||||||
|
13
sanlock.spec
13
sanlock.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
|
||||||
|
|
||||||
%define with_fence_sanlockd 0
|
%define with_fence_sanlockd 0
|
||||||
%define with_sanlk_reset 0
|
%define with_sanlk_reset 0
|
||||||
|
|
||||||
@ -162,8 +167,8 @@ make -C reset \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
install -D -m 644 src/sanlock.conf %{buildroot}/%{_sysconfdir}/sanlock/sanlock.conf
|
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 %SOURCE1 %{buildroot}/%{_fillupdir}/sysconfig.sanlock
|
||||||
install -D -m 644 %SOURCE2 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
|
install -D -m 644 %SOURCE2 %{buildroot}/%{_fillupdir}/sysconfig.wdmd
|
||||||
|
|
||||||
install -D -m 644 init.d/sanlock.service %{buildroot}/%{_unitdir}/sanlock.service
|
install -D -m 644 init.d/sanlock.service %{buildroot}/%{_unitdir}/sanlock.service
|
||||||
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsanlock
|
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/
|
%dir %attr(0700, root, root) %{_sysconfdir}/sanlock/
|
||||||
%config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf
|
%config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf
|
||||||
%{_sbindir}/rcsanlock
|
%{_sbindir}/rcsanlock
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
|
%{_fillupdir}/sysconfig.sanlock
|
||||||
%{_sbindir}/rcwdmd
|
%{_sbindir}/rcwdmd
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
|
%{_fillupdir}/sysconfig.wdmd
|
||||||
%{_unitdir}/sanlock.service
|
%{_unitdir}/sanlock.service
|
||||||
%{_unitdir}/wdmd.service
|
%{_unitdir}/wdmd.service
|
||||||
%{_sbindir}/sanlock
|
%{_sbindir}/sanlock
|
||||||
|
Loading…
Reference in New Issue
Block a user