From 5c4aa62ebd974815e28e617268b8fd2d6b5936772a9431c6bf73aa5028faa23c Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 24 Nov 2017 10:22:26 +0000
Subject: [PATCH] Accepting request 544668 from
 home:RBrownSUSE:branches:network

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

OBS-URL: https://build.opensuse.org/request/show/544668
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=129
---
 openvswitch.changes | 6 ++++++
 openvswitch.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/openvswitch.changes b/openvswitch.changes
index 94f59de..2a38f70 100644
--- a/openvswitch.changes
+++ b/openvswitch.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:38:56 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Sep 29 19:46:56 UTC 2017 - mchandras@suse.de
 
diff --git a/openvswitch.spec b/openvswitch.spec
index b74375e..343b319 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -17,6 +17,11 @@
 # needssslcertforbuild
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define lname libopenvswitch-2_8-0
 %ifarch aarch64 x86_64 %{ix86}
 # DPDK enabled by default
@@ -388,7 +393,7 @@ done
 %endif
 
 install -D -m 644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
-        %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
+        %{buildroot}%{_fillupdir}/sysconfig.openvswitch
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
 install -d -m 755 %{buildroot}%{_localstatedir}/log/openvswitch
@@ -603,7 +608,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_unitdir}/openvswitch.service
 %{_unitdir}/ovs-vswitchd.service
 %{_unitdir}/ovsdb-server.service
-%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch
+%{_fillupdir}/sysconfig.openvswitch
 %dir %{_localstatedir}/log/openvswitch
 %if %{with dpdk}
 %{_prefix}/lib/udev/rules.d/91-vfio.rules