From cb70fee0f4ad9ddd883dcb6bd1de9f68e0c6db9a399670b0c0e9d77d51783322 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 23 Nov 2017 15:02:16 +0000
Subject: [PATCH] Accepting request 544828 from
 home:RBrownSUSE:branches:multimedia:apps

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

OBS-URL: https://build.opensuse.org/request/show/544828
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/tvheadend?expand=0&rev=22
---
 tvheadend.changes |  6 ++++++
 tvheadend.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tvheadend.changes b/tvheadend.changes
index d83baf1..f3d7cd9 100644
--- a/tvheadend.changes
+++ b/tvheadend.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:53:28 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Sat Jul  1 08:19:55 UTC 2017 - aloisio@gmx.com
 
diff --git a/tvheadend.spec b/tvheadend.spec
index 1cc9e06..dc20bae 100644
--- a/tvheadend.spec
+++ b/tvheadend.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
+
 %define htsgroup video
 %define htsuser hts
 %define homedir %{_localstatedir}/lib/tvheadend
@@ -81,11 +86,11 @@ make V=1 %{?_smp_mflags}
 
 %install
 %make_install
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}/
 mkdir -p %{buildroot}%{_sbindir}
 install -D -m 644 rpm/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service
 sed -i 's@/home/tvheadend@%{homedir}@' rpm/%{name}.sysconfig
-install -m 644 rpm/%{name}.sysconfig %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -m 644 rpm/%{name}.sysconfig %{buildroot}/%{_fillupdir}/sysconfig.%{name}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 # Install superuser helper script
 sed -i 's@/home/tvheadend@%{homedir}@' %{SOURCE3}
@@ -126,7 +131,7 @@ getent passwd %htsuser >/dev/null || %{_sbindir}/useradd -g %{htsgroup} -m -d %{
 %{_datadir}/tvheadend
 %{_mandir}/man1/tvheadend.1%{?ext_man}
 %{_unitdir}/%{name}.service
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %{_sbindir}/%{name}_super
 %{_sbindir}/rc%{name}