From 84e3be8dadbdbacd5ed9f3b98933ec057f303ad90da1e33012011ed69eee6841 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 19 Oct 2020 03:17:53 +0000
Subject: [PATCH] Accepting request 842427 from
 home:sndirsch:branches:X11:Utilities

- move skeleton files to /usr/etc/skel on Tumbleweed (boo#1176431)

OBS-URL: https://build.opensuse.org/request/show/842427
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=49
---
 x11-tools.changes |  5 +++++
 x11-tools.spec    | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/x11-tools.changes b/x11-tools.changes
index 077dc39..fa9cdda 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 19 03:10:18 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- move skeleton files to /usr/etc/skel on Tumbleweed (boo#1176431) 
+
 -------------------------------------------------------------------
 Mon Sep 28 19:21:21 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/x11-tools.spec b/x11-tools.spec
index a31e30e..ab2027c 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -53,17 +53,20 @@ Some useful tools for the X Window System.
 mkdir -p %{buildroot}/usr/bin/
 install -m 755 %{_sourcedir}/xf86debug      %{buildroot}/usr/bin
 %if 0%{?suse_version} >= 1550
+mkdir -p %{buildroot}/usr/etc/skel
+install -m 644 %{_sourcedir}/xim.template %{buildroot}/usr/etc/skel/.xim.template
+install -m 644 %{S:37} %{buildroot}/usr/etc/skel/.i18n
 mkdir -p %{buildroot}/%{_distconfdir}/X11/xim.d
 install -m 644 %{_sourcedir}/xim  %{buildroot}/%{_distconfdir}/X11
 install -m 644 %{_sourcedir}/none %{buildroot}/%{_distconfdir}/X11/xim.d
 %else
+mkdir -p %{buildroot}/etc/skel
+install -m 644 %{_sourcedir}/xim.template %{buildroot}/etc/skel/.xim.template
+install -m 644 %{S:37} %{buildroot}/etc/skel/.i18n
 mkdir -p %{buildroot}/etc/X11/xim.d
 install -m 644 %{_sourcedir}/xim  %{buildroot}/etc/X11
 install -m 644 %{_sourcedir}/none %{buildroot}/etc/X11/xim.d
 %endif
-mkdir -p %{buildroot}/etc/skel
-install -m 644 %{_sourcedir}/xim.template %{buildroot}/etc/skel/.xim.template
-install -m 644 %{S:37} %{buildroot}/etc/skel/.i18n
 mkdir -p  %{buildroot}/%{_fillupdir}/
 install -c -m 644 %{_sourcedir}/sysconfig.language-%{name} %{buildroot}/%{_fillupdir}/
 mkdir -p %{buildroot}/usr/lib/nvidia
@@ -81,17 +84,20 @@ install -m 755 %{_sourcedir}/nvidia-post-uninstall \
 /usr/lib/nvidia/pre-install
 /usr/lib/nvidia/post-uninstall
 %if 0%{?suse_version} >= 1550
+%dir /usr/etc/skel
+/usr/etc/skel/.i18n
+/usr/etc/skel/.xim.template
 %{_distconfdir}/X11
 %{_distconfdir}/X11/xim
 %dir %{_distconfdir}/X11/xim.d
 %{_distconfdir}/X11/xim.d/*
 %else
+/etc/skel/.i18n
+/etc/skel/.xim.template
 /etc/X11/xim
 %dir /etc/X11/xim.d
 /etc/X11/xim.d/*
 %endif
-/etc/skel/.xim.template
-/etc/skel/.i18n
 %{_fillupdir}/sysconfig.language-%{name}
 
 %changelog