Accepting request 544740 from home:RBrownSUSE:branches:network:utilities

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

OBS-URL: https://build.opensuse.org/request/show/544740
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iodine?expand=0&rev=11
This commit is contained in:
Malcolm Lewis 2017-11-23 15:06:00 +00:00 committed by Git OBS Bridge
parent 1a3c53264f
commit be48ac7807
2 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:45:54 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Mon Mar 13 00:54:38 UTC 2017 - malcolmlewis@opensuse.org

View File

@ -17,6 +17,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
Name: iodine
Version: 0.7.0
Release: 0
@ -55,11 +60,11 @@ make install PREFIX=%{buildroot}%{_prefix}
# Install client files
mkdir -p %{buildroot}%{_unitdir}
install -m 0644 %{S:1} %{buildroot}%{_unitdir}/
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m 0644 %{S:2} %{buildroot}%{_localstatedir}/adm/fillup-templates/
mkdir -p %{buildroot}%{_fillupdir}
install -m 0644 %{S:2} %{buildroot}%{_fillupdir}/
# Install server files
install -m 0644 %{S:3} %{buildroot}%{_unitdir}/
install -m 0644 %{S:4} %{buildroot}%{_localstatedir}/adm/fillup-templates/
install -m 0644 %{S:4} %{buildroot}%{_fillupdir}/
# Copy common man page to avoid warning
pushd %{buildroot}%{_mandir}/man8/
cp %{name}.8 %{name}d.8
@ -94,8 +99,8 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rciodined
%doc CHANGELOG README TODO
%{_sbindir}/%{name}
%{_sbindir}/%{name}d
%{_localstatedir}/adm/fillup-templates/sysconfig.iodine
%{_localstatedir}/adm/fillup-templates/sysconfig.iodined
%{_fillupdir}/sysconfig.iodine
%{_fillupdir}/sysconfig.iodined
%{_sbindir}/rciodine
%{_sbindir}/rciodined
%{_unitdir}/iodine.service