From d1090c2beff630324898fa2e24322f80c57616a98d0f52b5edf35e296aabd807 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 01:30:47 +0000 Subject: [PATCH 1/3] - 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 + +- 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} From 02d953641b283af836f1987ffaea69aa8f3179e06b07bdde25c6e0c20bb70b1e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 09:57:50 +0000 Subject: [PATCH 2/3] - reverted move to /usr/etc/X11 for now (boo#1173053, comment#3) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=13 --- xmodmap.changes | 5 +++++ xmodmap.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xmodmap.changes b/xmodmap.changes index ed23ed4..5c5e3e0 100644 --- a/xmodmap.changes +++ b/xmodmap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 09:51:56 UTC 2020 - Stefan Dirsch + +- reverted move to /usr/etc/X11 for now (boo#1173053, comment#3) + ------------------------------------------------------------------- Sat Sep 5 01:22:15 UTC 2020 - Stefan Dirsch diff --git a/xmodmap.spec b/xmodmap.spec index 5ffc315..c32454b 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -16,6 +16,8 @@ # +%define UsrEtcMove 0 + Name: xmodmap Version: 1.0.10 Release: 0 @@ -50,7 +52,7 @@ make %{?_smp_mflags} %install %make_install -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} install -m0644 -D %{SOURCE1} %{buildroot}%{_distconfdir}/X11/Xmodmap install -m0644 -D %{SOURCE2} %{buildroot}%{_distconfdir}/X11/Xmodmap.remote %else @@ -61,7 +63,7 @@ install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README.md -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/Xmodmap %{_distconfdir}/X11/Xmodmap.remote From 2926575e9edf6a8aa33e52549753048db2ceca3972071d1077fd7f004dccb206 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Sep 2020 16:08:06 +0000 Subject: [PATCH 3/3] - reenabled move to /usr/etc/X11 for Tumbleweed (boo#1173053) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=14 --- xmodmap.changes | 5 +++++ xmodmap.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xmodmap.changes b/xmodmap.changes index 5c5e3e0..86162c8 100644 --- a/xmodmap.changes +++ b/xmodmap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 9 15:57:08 UTC 2020 - Stefan Dirsch + +- reenabled move to /usr/etc/X11 for Tumbleweed (boo#1173053) + ------------------------------------------------------------------- Tue Sep 8 09:51:56 UTC 2020 - Stefan Dirsch diff --git a/xmodmap.spec b/xmodmap.spec index c32454b..da39fc4 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -16,7 +16,9 @@ # -%define UsrEtcMove 0 +%if 0%{?suse_version} >= 1550 +%define UsrEtcMove 1 +%endif Name: xmodmap Version: 1.0.10 @@ -52,7 +54,7 @@ make %{?_smp_mflags} %install %make_install -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} install -m0644 -D %{SOURCE1} %{buildroot}%{_distconfdir}/X11/Xmodmap install -m0644 -D %{SOURCE2} %{buildroot}%{_distconfdir}/X11/Xmodmap.remote %else @@ -63,7 +65,7 @@ install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README.md -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/Xmodmap %{_distconfdir}/X11/Xmodmap.remote