Accepting request 546722 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/546722
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=144

nfs-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:40:51 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Oct  6 04:23:19 UTC 2017 - nfbrown@suse.com
 

nfs-utils.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
+
 Name:           nfs-utils
 Version:        2.1.1
 Release:        0
@@ -170,8 +175,8 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-client
 # sysconfig-data
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}
 # idmapd setup
 install -D -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/idmapd.conf
 mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/rpc_pipefs
@@ -318,7 +323,7 @@ fi
 %{_mandir}/man8/nfsiostat.8%{ext_man}
 %{_mandir}/man8/blkmapd.8%{ext_man}
 %{_mandir}/man8/rpc.svcgssd.8%{ext_man}
-%{_localstatedir}/adm/fillup-templates/sysconfig.nfs
+%{_fillupdir}/sysconfig.nfs
 %attr(0711,statd,nogroup) %dir %{_localstatedir}/lib/nfs
 %dir %{_localstatedir}/lib/nfs/rpc_pipefs
 %dir %{_localstatedir}/lib/nfs/v4recovery