From 02d953641b283af836f1987ffaea69aa8f3179e06b07bdde25c6e0c20bb70b1e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 09:57:50 +0000 Subject: [PATCH] - 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