From 19b1e4a1fdfb3cfc1807de233c56e1c2ddadcea13a747f5f94dd2d0c3125895b Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 24 Nov 2017 10:01:27 +0000
Subject: [PATCH] Accepting request 544699 from
 home:RBrownSUSE:branches:Base:System

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

OBS-URL: https://build.opensuse.org/request/show/544699
OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=95
---
 sensors.changes |  6 ++++++
 sensors.spec    | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/sensors.changes b/sensors.changes
index 5a9754a..ea35de6 100644
--- a/sensors.changes
+++ b/sensors.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:41:51 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Nov 30 14:32:40 CET 2016 - jdelvare@suse.com
 
diff --git a/sensors.spec b/sensors.spec
index 7698713..a812e84 100644
--- a/sensors.spec
+++ b/sensors.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sensors
 #
-# Copyright (c) 2016 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:           sensors
 BuildRequires:  bison
 BuildRequires:  flex
@@ -125,10 +130,10 @@ make %{?_smp_mflags} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} M
     cp -a COPYING			$RPM_BUILD_ROOT/%{_docdir}/sensord/
     chmod -R u+rwX,g+rX,o+rX		$RPM_BUILD_ROOT/%{_docdir}/sensors/ $RPM_BUILD_ROOT/%{_docdir}/sensord/
     chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
-    mkdir -p				$RPM_BUILD_ROOT/%{_unitdir} $RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates
+    mkdir -p				$RPM_BUILD_ROOT/%{_unitdir} $RPM_BUILD_ROOT/%{_fillupdir}
     cp -a prog/init/*.service 		$RPM_BUILD_ROOT/%{_unitdir}/
     ln -sf /sbin/service %{buildroot}/usr/sbin/rclm_sensors
-    cp -a %{SOURCE1}			$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates
+    cp -a %{SOURCE1}			$RPM_BUILD_ROOT/%{_fillupdir}
 
 %pre
 %service_add_pre lm_sensors.service
@@ -214,7 +219,7 @@ fi
 %files -n sensord
 %defattr(-,root,root)
 %{_unitdir}/sensord.service
-%{_localstatedir}/adm/fillup-templates/sysconfig.sensord
+%{_fillupdir}/sysconfig.sensord
 /usr/sbin/sensord
 %dir %{_docdir}/sensord
 %doc %{_docdir}/sensord/COPYING