From 7aa40e3a26fc4f9642c94a9cd98b9932d762e98d1b31a0701801d13b0ca91f30 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 24 Nov 2017 10:18:05 +0000
Subject: [PATCH] Accepting request 544691 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/544691
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=59
---
 pcp.changes |  6 ++++++
 pcp.spec    | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pcp.changes b/pcp.changes
index a31f124..98494dc 100644
--- a/pcp.changes
+++ b/pcp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:41:01 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Aug 30 23:30:36 UTC 2017 - ddiss@suse.com
 
diff --git a/pcp.spec b/pcp.spec
index ff9d150..ea08f8e 100644
--- a/pcp.spec
+++ b/pcp.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
+
 BuildRequires:  -post-build-checks
 
 %if 0%{?suse_version} > 1140 || 0%{?fedora_version} > 14
@@ -2230,13 +2235,13 @@ ln -sf /sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rcpmwebd
 %endif
 
 # SUSE requires use of %fillup_and_insserv
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates
+mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmlogger \
-	$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.pmlogger
+	$RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmlogger
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmproxy \
-	$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.pmproxy
+	$RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmproxy
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmcd \
-	$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.pmcd
+	$RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmcd
 
 %else
 # default chkconfig off for Fedora and RHEL
@@ -2807,9 +2812,9 @@ fi
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
 %if 0%{?suse_version}
-%{_localstatedir}/adm/fillup-templates/sysconfig.pmlogger
-%{_localstatedir}/adm/fillup-templates/sysconfig.pmproxy
-%{_localstatedir}/adm/fillup-templates/sysconfig.pmcd
+%{_fillupdir}/sysconfig.pmlogger
+%{_fillupdir}/sysconfig.pmproxy
+%{_fillupdir}/sysconfig.pmcd
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
 %config(noreplace) %{_sysconfdir}/sysconfig/pmproxy