Accepting request 544709 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/544709
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=221

alsa.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:42:45 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Nov 14 12:49:25 CET 2017 - tiwai@suse.de
 

alsa.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 package_version	1.1.5
 %if 0%{?suse_version} < 1200
 %define _udevrulesdir /lib/udev/rules.d/
@@ -184,11 +189,11 @@ install -c -m 0755 %{SOURCE41} %{buildroot}/sbin
 # install template to update rc.config and sysconfig files:
 # (updating the actual files is done in the %post-script)
 #
-mkdir -p -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p -m 755 %{buildroot}%{_fillupdir}
 mkdir -p -m 755 %{buildroot}%{_sysconfdir}/sysconfig
-install -m 644 $RPM_SOURCE_DIR/sysconfig.sound %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 $RPM_SOURCE_DIR/sysconfig.sound %{buildroot}%{_fillupdir}
 %if 0%{?suse_version} <= 1310
-install -m 644 $RPM_SOURCE_DIR/sysconfig.joystick %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 $RPM_SOURCE_DIR/sysconfig.joystick %{buildroot}%{_fillupdir}
 %endif
 #
 # documents
@@ -236,7 +241,7 @@ exit 0
 %{_bindir}/*
 %{_prefix}/lib/all_notes_off.*
 %{_datadir}/sounds/alsa
-%{_localstatedir}/adm/fillup-templates/*
+%{_fillupdir}/*
 %{_udevrulesdir}*
 
 %files devel