From 1191eed242871ec3adc458b66078e3cbb16be15aaa15e00647ffe215abcfc47b Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Fri, 24 Nov 2017 07:03:57 +0000
Subject: [PATCH] Accepting request 544681 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/544681
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=51
---
 gpm.changes |  6 ++++++
 gpm.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gpm.changes b/gpm.changes
index f1a01a9..22aff46 100644
--- a/gpm.changes
+++ b/gpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:40:02 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Sep 11 18:59:26 UTC 2017 - jengelh@inai.de
 
diff --git a/gpm.spec b/gpm.spec
index 0e4b269..92a4c95 100644
--- a/gpm.spec
+++ b/gpm.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
+
 Name:           gpm
 %define lname	libgpm2
 Version:        1.20.7
@@ -153,11 +158,11 @@ done
 #install contrib/emacs/t-mouse.el* %%{buildroot}/usr/share/emacs/site-lisp
 #
 # start script
-install -m 755 -d %{buildroot}/var/adm/fillup-templates
+install -m 755 -d %{buildroot}%{_fillupdir}
 install -m 755 -d %{buildroot}/%{_unitdir}
 install -m 755 -d %{buildroot}/usr/sbin
 install -m 755 inputattach %{buildroot}%{_sbindir}
-install -m 644 sysconfig.mouse-%{name} %{buildroot}/var/adm/fillup-templates
+install -m 644 sysconfig.mouse-%{name} %{buildroot}%{_fillupdir}
 install -m 644 %{S:2} %{buildroot}/%{_unitdir}/gpm.service
 ln -sf %{_sbindir}/service %{buildroot}/usr/sbin/rcgpm
 # there were two variables with the same value GPM_PROTOCOL and MOUSETYPE
@@ -208,7 +213,7 @@ touch %{buildroot}/run/gpm.pid
 %{_unitdir}/gpm.service
 %{_bindir}/*
 %{_sbindir}/*
-/var/adm/fillup-templates/*
+%{_fillupdir}/*
 %ghost /run/gpm.pid
 
 %files -n %lname