Accepting request 546259 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/546259
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flannel?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:45:02 +00:00 committed by Git OBS Bridge
parent 7df98e9f16
commit 9249add344
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:48:19 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Tue Aug 29 08:27:54 UTC 2017 - mmeister@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
Name: flannel
Version: 0.8.0
Release: 0
@ -66,7 +71,7 @@ install -d %{buildroot}/%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcflanneld
# Sysconfig
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.flanneld
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.flanneld
install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
# Additional
@ -101,7 +106,7 @@ mv %{buildroot}%{_bindir}/flannel %{buildroot}%{_sbindir}/flanneld
%{_sbindir}/rcflanneld
# Sysconfig
%{_localstatedir}/adm/fillup-templates/sysconfig.flanneld
%{_fillupdir}/sysconfig.flanneld
%{_tmpfilesdir}/%{name}.conf
%attr(0750,root,root) %dir %ghost %{_rundir}/%{name}