From d1090c2beff630324898fa2e24322f80c57616a98d0f52b5edf35e296aabd807 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 5 Sep 2020 01:30:47 +0000
Subject: [PATCH] - moved Xmodmap files to /usr/etc/X11 (boo#1173053)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=12
---
 xmodmap.changes |  5 +++++
 xmodmap.spec    | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/xmodmap.changes b/xmodmap.changes
index 43a5417..ed23ed4 100644
--- a/xmodmap.changes
+++ b/xmodmap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Sep  5 01:22:15 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- moved Xmodmap files to /usr/etc/X11 (boo#1173053)
+
 -------------------------------------------------------------------
 Thu Feb 21 11:14:12 UTC 2019 - sndirsch@suse.com
 
diff --git a/xmodmap.spec b/xmodmap.spec
index 3717c13..5ffc315 100644
--- a/xmodmap.spec
+++ b/xmodmap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmodmap
 #
-# Copyright (c) 2019 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/
 #
 
 
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Utility to modify keymaps and pointer button mappings in X
 License:        MIT
 Group:          System/X11/Utilities
-Url:            http://xorg.freedesktop.org/
+URL:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 Source1:        Xmodmap.template
 Source2:        Xmodmap.remote.template
@@ -50,14 +50,25 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+%if 0%{?suse_version} >= 1550
+install -m0644 -D %{SOURCE1} %{buildroot}%{_distconfdir}/X11/Xmodmap
+install -m0644 -D %{SOURCE2} %{buildroot}%{_distconfdir}/X11/Xmodmap.remote
+%else
 install -m0644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/Xmodmap
 install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote
+%endif
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README.md
+%if 0%{?suse_version} >= 1550
+%dir %{_distconfdir}/X11
+%{_distconfdir}/X11/Xmodmap
+%{_distconfdir}/X11/Xmodmap.remote
+%else
 %config %{_sysconfdir}/X11/Xmodmap
 %config %{_sysconfdir}/X11/Xmodmap.remote
+%endif
 %{_bindir}/xmodmap
 %{_mandir}/man1/xmodmap.1%{?ext_man}