From dd45e916991175c1a309e4d8bf3447c39add7c9d13991d38b4a861cee963112e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 24 Nov 2017 12:47:52 +0000 Subject: [PATCH] move /var/adm/fillup-templates/sysconfig.displaymanager to %_fillupdir on TW and sle15/Leap 15 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=158 --- xdm.changes | 2 +- xdm.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xdm.changes b/xdm.changes index 39bd6d1..a0fe03c 100644 --- a/xdm.changes +++ b/xdm.changes @@ -2,7 +2,7 @@ Thu Nov 23 20:20:50 UTC 2017 - sndirsch@suse.com - move /var/adm/fillup-templates/sysconfig.displaymanager - to /usr/share/fillup-templates on TW and sle15/Leap 15 + to %_fillupdir on TW and sle15/Leap 15 ------------------------------------------------------------------- Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com diff --git a/xdm.spec b/xdm.spec index 6e9420f..52b49fd 100644 --- a/xdm.spec +++ b/xdm.spec @@ -147,9 +147,13 @@ pushd %{buildroot} tar xf %{SOURCE1} %if 0%{?suse_version} >= 1330 patch -p1 < %{PATCH2} -mv %{buildroot}/var/adm/fillup-templates \ - %{buildroot}/usr/share/fillup-templates %endif +%if "%{_fillupdir}" != "/var/adm/fillup-templates" + mkdir -p %{buildroot}$(dirname %{_fillupdir}) + mv %{buildroot}/var/adm/fillup-templates \ + %{buildroot}$(dirname %{_fillupdir}) +%endif + %if %dm_fallbacks tar xf %{SOURCE3} %endif