From 06ac47c0773f2ad4a8b6961066e975d4d2626c8f319d6f5eae4a50745337af45 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 23 Nov 2017 20:36:23 +0000
Subject: [PATCH] Accepting request 544733 from
 home:RBrownSUSE:branches:filesystems

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

OBS-URL: https://build.opensuse.org/request/show/544733
OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=48
---
 cdemu-daemon.changes |  6 ++++++
 cdemu-daemon.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes
index 313dc22..6dfab06 100644
--- a/cdemu-daemon.changes
+++ b/cdemu-daemon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:44:48 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Aug  7 19:29:16 UTC 2017 - jengelh@inai.de
 
diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index 6bee690..fa3710d 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.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:           cdemu-daemon
 Version:        3.1.0
 Release:        0
@@ -67,10 +72,10 @@ make %{?_smp_mflags}
 %install
 b="%buildroot"
 %cmake_install
-mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" \
+mkdir -p "$b/%_sbindir" "$b/%{_fillupdir}" \
 	"$b/%_prefix/lib/udev/rules.d"
 install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
-install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon"
+install -pm0644 "%{S:3}" "$b/%{_fillupdir}/sysconfig.cdemu-daemon"
 # Not desired for security; it would permit a user to start a system service.
 rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/"
 %find_lang %name
@@ -85,7 +90,7 @@ rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/"
 %_libexecdir/cdemu-daemon-session.sh
 %_datadir/dbus-1/
 %_mandir/man8/cdemu-daemon.8*
-%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon
+%{_fillupdir}/sysconfig.cdemu-daemon
 %_prefix/lib/udev/
 
 %changelog