From 1525442cc0f2b5f28929b5ffd6d239d1ee58deea726de1aa1268bd7392cda752 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sun, 13 Sep 2020 08:25:45 +0000
Subject: [PATCH] Accepting request 833575 from
 home:sndirsch:branches:X11:Utilities

- moved xim files to /usr/etc; xinit is already prepared for this
  (boo#1176431)

OBS-URL: https://build.opensuse.org/request/show/833575
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=44
---
 x11-tools.changes |  6 ++++++
 x11-tools.spec    | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/x11-tools.changes b/x11-tools.changes
index 504f415..8364456 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 10 21:15:12 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- moved xim files to /usr/etc; xinit is already prepared for this
+  (boo#1176431)
+
 -------------------------------------------------------------------
 Wed Oct 24 12:48:26 UTC 2018 - sndirsch@suse.com
 
diff --git a/x11-tools.spec b/x11-tools.spec
index 0bcc47d..f66a002 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package x11-tools
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -60,9 +60,15 @@ Authors:
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin/
 install -m 755 $RPM_SOURCE_DIR/xf86debug      $RPM_BUILD_ROOT/usr/bin
+%if 0%{?suse_version} >= 1550
+mkdir -p $RPM_BUILD_ROOT/%{_distconfdir}/X11/xim.d
+install -m 644 $RPM_SOURCE_DIR/xim  $RPM_BUILD_ROOT/%{_distconfdir}/X11
+install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/%{_distconfdir}/X11/xim.d
+%else
 mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d
 install -m 644 $RPM_SOURCE_DIR/xim  $RPM_BUILD_ROOT/etc/X11
 install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/etc/X11/xim.d
+%endif
 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
@@ -79,13 +85,20 @@ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
 
 %files
 %defattr(-, root, root)
-%dir /etc/X11/xim.d
 %dir /usr/lib/nvidia
 /usr/bin/xf86debug
 /usr/lib/nvidia/pre-install
 /usr/lib/nvidia/post-uninstall
+%if 0%{?suse_version} >= 1550
+%{_distconfdir}/X11
+%{_distconfdir}/X11/xim
+%dir %{_distconfdir}/X11/xim.d
+%{_distconfdir}/X11/xim.d/*
+%else
 /etc/X11/xim
+%dir /etc/X11/xim.d
 /etc/X11/xim.d/*
+%endif
 /etc/skel/.xim.template
 /etc/skel/.i18n
 %{_fillupdir}/sysconfig.language-%{name}