From 96e969a95c5b89b64c77b1a08a9ad953ccf370519df150a42a672d5fd144fab1 Mon Sep 17 00:00:00 2001
From: David Mulder <david.mulder@suse.com>
Date: Mon, 27 Nov 2017 16:09:07 +0000
Subject: [PATCH] Accepting request 546037 from
 home:RBrownSUSE:branches:network:samba:STABLE

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

OBS-URL: https://build.opensuse.org/request/show/546037
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=578
---
 samba.changes |  6 ++++++
 samba.spec    | 25 +++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/samba.changes b/samba.changes
index cd754ce..9abd962 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 27 14:23:09 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Nov 15 17:00:50 UTC 2017 - dmulder@suse.com
 
diff --git a/samba.spec b/samba.spec
index dad89c5..236af61 100644
--- a/samba.spec
+++ b/samba.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
+
 %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
 
 %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
@@ -1142,7 +1147,7 @@ install -d -m 0755 -p \
 	%{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,lock/msg.lock,printing,private/msg.sock,profiles,winbindd_privileged} \
 	%{buildroot}/%{LOGDIR} \
 	%{buildroot}/%{PIDDIR} \
-	%{buildroot}/%{_var}/adm/fillup-templates \
+	%{buildroot}/%{_fillupdir} \
 	%{buildroot}/%{_var}/cache/krb5rcache \
 	%{buildroot}/%{_var}/log/ctdb \
 	%{buildroot}/%{DOCDIR} \
@@ -1161,7 +1166,7 @@ rm \
 %endif
 
 # CTDB
-install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
+install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_fillupdir}
 %if 0%{?suse_version} > 1220
 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
 ln -s service %{buildroot}/%{_sbindir}/rcctdb
@@ -1233,7 +1238,7 @@ done
 	install -m 0644 -p systemd/samba-ad-dc.service %{buildroot}/%{_unitdir}
 	ln -s service %{buildroot}/%{_sbindir}/rcsamba-ad-dc
 %endif
-install -m 0644 systemd/sysconfig.* %{buildroot}%_var/adm/fillup-templates
+install -m 0644 systemd/sysconfig.* %{buildroot}%{_fillupdir}
 install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf
 %else
 for script in ${startScripts}; do
@@ -1258,8 +1263,8 @@ install -m 0755 tools/update-apparmor-samba-profile \
 install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
 install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
 install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
-install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
-install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
+install -m 0644 config/dhcp.conf %{buildroot}/%{_fillupdir}/samba-client-dhcp.conf
+install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_fillupdir}/sysconfig.dhcp-samba-client
 for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd; do
 	install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
 done
@@ -1700,7 +1705,7 @@ fi
 %exclude %{_mandir}/man8/samba-tool.8.*
 %exclude %{_mandir}/man8/samba.8.*
 %if 0%{?suse_version} > 1220
-%{_var}/adm/fillup-templates/sysconfig.samba
+%{_fillupdir}/sysconfig.samba
 %endif
 
 %files client
@@ -1808,8 +1813,8 @@ fi
 %{_datadir}/samba/templates
 %dir %{DOCDIR}
 %doc %{DOCDIR}/README.%{VENDOR}
-%{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
-%{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
+%{_fillupdir}/samba-client-dhcp.conf
+%{_fillupdir}/sysconfig.dhcp-samba-client
 %dir %{LOCKDIR}
 %dir %{LOCKDIR}/lock
 %dir %{LOCKDIR}/private
@@ -2047,7 +2052,7 @@ fi
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml
 %attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged
 %if 0%{?suse_version} > 1220
-%{_var}/adm/fillup-templates/sysconfig.samba-winbind
+%{_fillupdir}/sysconfig.samba-winbind
 %endif
 %attr(0770,root,root) %{_var}/cache/krb5rcache
 %if 0%{?suse_version} > 1110
@@ -2061,7 +2066,7 @@ fi
 %files -n ctdb
 %defattr(-,root,root)
 %dir %{_sysconfdir}/ctdb
-%{_var}/adm/fillup-templates/sysconfig.ctdb
+%{_fillupdir}/sysconfig.ctdb
 %{_sysconfdir}/ctdb/notify.sh
 %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
 %{_sysconfdir}/ctdb/debug-hung-script.sh