From 829420d57372bdfee181014198412573f2cb30da628d924f29a4f07a9933a875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 24 Nov 2017 07:06:37 +0000
Subject: [PATCH] Accepting request 544710 from
 home:RBrownSUSE:branches:multimedia:libs

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

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

diff --git a/pulseaudio.changes b/pulseaudio.changes
index 59d7a56..2bc0ca3 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:42:49 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Sep 19 08:02:43 UTC 2017 - oholecek@suse.com
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index e1f30d4..2599a89 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.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 drvver  11.1
 %define soname  0
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
@@ -371,8 +376,8 @@ ln -s default.conf %{buildroot}%{_datadir}/pulseaudio/alsa-mixer/profile-sets/ex
 %find_lang %{name}
 install %{SOURCE2} %{buildroot}%{_bindir}
 chmod 755 %{buildroot}%{_bindir}/setup-pulseaudio
-install -d %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 0644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -d %{buildroot}%{_fillupdir}
+install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.sh
 touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.csh
@@ -434,7 +439,7 @@ exit 0
 %{_bindir}/qpaeq
 %dir %{_datadir}/pulseaudio
 %{_datadir}/pulseaudio/alsa-mixer
-%{_localstatedir}/adm/fillup-templates/sysconfig.sound-pulseaudio
+%{_fillupdir}/sysconfig.sound-pulseaudio
 %dir %{_libdir}/pulseaudio
 %{_libdir}/pulseaudio/libpulsecore-%{drvver}.so
 %dir %{_libdir}/pulse-%{drvver}/