From bf1a342689b2cd88fa3ff5bdd347bc79660f92c16a2f5c4ecfa631cff6e05c0e Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 23 Nov 2017 15:03:00 +0000
Subject: [PATCH] Accepting request 544790 from
 home:RBrownSUSE:branches:Application:Geo

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

OBS-URL: https://build.opensuse.org/request/show/544790
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=111
---
 gpsd.changes |  6 ++++++
 gpsd.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gpsd.changes b/gpsd.changes
index 61f4bb2..2c76e03 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:50:05 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Nov 20 13:48:01 UTC 2017 - mpluskal@suse.com
 
diff --git a/gpsd.spec b/gpsd.spec
index 3da64f4..fe7ba75 100644
--- a/gpsd.spec
+++ b/gpsd.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
+
 %define         sover 23
 %define		    libgps libgps%{sover}
 %define		    libQgps libQgpsmm%{sover}
@@ -161,12 +166,12 @@ export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
 DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install
 install -d -m 755 %{buildroot}%{_udevdir}
 install -d -m 755 %{buildroot}%{_udevdir}/rules.d
-install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -d -m 755 %{buildroot}%{_fillupdir}
 install -d -m 755 %{buildroot}%{_datadir}/applications
 install -d -m 755 %{buildroot}%{python_sitearch}
 install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules
 install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh
-install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 %{SOURCE3} %{buildroot}%{_fillupdir}
 if [ %{buildroot}%{python_sitelib} != %{buildroot}%{python_sitearch} ] ; then
 	mv -f %{buildroot}%{python_sitelib}/*  %{buildroot}%{python_sitearch}
 fi
@@ -230,7 +235,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
 %{_sbindir}/gpsd
 %{_sbindir}/gpsdctl
 %{_bindir}/gpsctl
-%{_localstatedir}/adm/fillup-templates/sysconfig.gpsd
+%{_fillupdir}/sysconfig.gpsd
 
 %files -n %{libgps}
 %defattr(-,root,root)