From 7d7b464da56435d892837b4d5c677507d248cc8ee31bcfc76693585f6a81111c Mon Sep 17 00:00:00 2001
From: Dmitriy Perlow <dap.darkness@gmail.com>
Date: Sat, 25 Nov 2017 17:10:03 +0000
Subject: [PATCH] Accepting request 544750 from home:RBrownSUSE:branches:games

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

OBS-URL: https://build.opensuse.org/request/show/544750
OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=20
---
 bzflag.changes |  6 ++++++
 bzflag.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bzflag.changes b/bzflag.changes
index c6225e6..7f7c8b1 100644
--- a/bzflag.changes
+++ b/bzflag.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:46:50 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Apr 17 07:49:03 UTC 2013 - joop.boonen@opensuse.org
 
diff --git a/bzflag.spec b/bzflag.spec
index 5dff7c6..cd09317 100644
--- a/bzflag.spec
+++ b/bzflag.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bzflag
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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:           bzflag
 Version:        2.4.2
 Release:        0
@@ -92,7 +97,7 @@ install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/bzflagserver
 mkdir -p %{buildroot}%{_sbindir}
 ln -s %{_sysconfdir}/init.d/bzflagserver %{buildroot}%{_sbindir}/rcbzflagserver
 make MKDIR_P="mkdir -p --" DESTDIR=%{buildroot} install
-install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
+install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.bzflagserver-bzflag
 mkdir -p %{buildroot}%{_datadir}/bzflag/maps
 install -m 644 maps/*bzmap %{buildroot}%{_datadir}/bzflag/maps
 install -D -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/bzflag.png
@@ -111,7 +116,7 @@ install -D -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/bzflag.png
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man5/*
 %{_mandir}/man6/*
-%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
+%{_fillupdir}/sysconfig.bzflagserver-bzflag
 %{_libdir}/%{name}/
 
 %changelog