From 2926575e9edf6a8aa33e52549753048db2ceca3972071d1077fd7f004dccb206 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Sep 2020 16:08:06 +0000 Subject: [PATCH] - 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