SHA256
1
0
forked from pool/keepalived

Accepting request 544663 from home:RBrownSUSE:branches:network

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

OBS-URL: https://build.opensuse.org/request/show/544663
OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=33
This commit is contained in:
Olaf Hering 2017-11-24 08:44:30 +00:00 committed by Git OBS Bridge
parent e56f6d28b5
commit 0272e4868b
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:38:30 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Thu Feb 16 12:27:53 UTC 2017 - mrueckert@suse.de

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
%if 0%{?suse_version} > 1210
%bcond_without systemd
%else
@ -114,7 +119,7 @@ make %{?_smp_mflags}
%install
make install DESTDIR="%{buildroot}"
install -dD -m 0750 %{buildroot}%{_var}/lib/%{name}
install -D -m 0644 %{buildroot}/etc/sysconfig/keepalived %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
install -D -m 0644 %{buildroot}/etc/sysconfig/keepalived %{buildroot}%{_fillupdir}/sysconfig.%{name}
%if %{with systemd}
install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
@ -179,7 +184,7 @@ rm -rv %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalive
/etc/init.d/keepalived
%endif
%dir %attr(-,keepalived,keepalived) %{_var}/lib/%{name}
/var/adm/fillup-templates/sysconfig.%{name}
%{_fillupdir}/sysconfig.%{name}
%doc AUTHOR ChangeLog CONTRIBUTORS COPYING README
%doc doc/samples/
%doc doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt