Accepting request 544756 from home:RBrownSUSE:branches:server:proxy

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

OBS-URL: https://build.opensuse.org/request/show/544756
OBS-URL: https://build.opensuse.org/package/show/server:proxy/cntlm?expand=0&rev=37

cntlm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:47:23 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri May 19 16:01:08 UTC 2017 - dimstar@opensuse.org
 

cntlm.spec

@@ -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:           cntlm
 Version:        0.92.3
 Release:        0
@@ -75,7 +80,7 @@ install -D -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
 install -D -m 644 %{SOURCE4} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %endif
-install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
 %pre
 # on `rpm -ivh` PARAM is 1
@@ -137,6 +142,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf || :
 %endif
 %{_sbindir}/*
 %{_mandir}/man1/%{name}.1*
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 
 %changelog