diff --git a/x11-tools.changes b/x11-tools.changes index daf077a..9e9c500 100644 --- a/x11-tools.changes +++ b/x11-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:54:15 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Aug 19 20:00:24 CEST 2015 - tiwai@suse.de diff --git a/x11-tools.spec b/x11-tools.spec index 5679db4..937975f 100644 --- a/x11-tools.spec +++ b/x11-tools.spec @@ -1,7 +1,7 @@ # # spec file for package x11-tools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: x11-tools PreReq: %fillup_prereq Provides: 3ddiag @@ -61,8 +66,8 @@ install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/etc/X11/xim.d mkdir -p $RPM_BUILD_ROOT/etc/skel install -m 644 $RPM_SOURCE_DIR/xim.template $RPM_BUILD_ROOT/etc/skel/.xim.template install -m 644 %{S:37} $RPM_BUILD_ROOT/etc/skel/.i18n -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/ -install -c -m 644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/ +mkdir -p $RPM_BUILD_ROOT%{_fillupdir}/ +install -c -m 644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT%{_fillupdir}/ mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \ $RPM_BUILD_ROOT/usr/lib/nvidia/pre-install @@ -83,6 +88,6 @@ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \ /etc/X11/xim.d/* /etc/skel/.xim.template /etc/skel/.i18n -/var/adm/fillup-templates/sysconfig.language-%{name} +%{_fillupdir}/sysconfig.language-%{name} %changelog