From a60f9f84950f342ee97ce60c3f81c2fda1327fd203b6324d0e343924603710d9 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 26 Nov 2020 16:31:15 +0000
Subject: [PATCH] Accepting request 851129 from home:tiwai:branches:M17N

- Move the startup snippet to /usr/etc/X11/xim.d for TW

OBS-URL: https://build.opensuse.org/request/show/851129
OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=61
---
 uim.changes |  5 +++++
 uim.spec    | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/uim.changes b/uim.changes
index d2550fe..a3b2522 100644
--- a/uim.changes
+++ b/uim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 26 16:48:21 CET 2020 - tiwai@suse.de
+
+- Move the startup snippet to /usr/etc/X11/xim.d for TW
+
 -------------------------------------------------------------------
 Fri Aug 21 18:05:04 UTC 2020 - Andreas Schwab <schwab@suse.de>
 
diff --git a/uim.spec b/uim.spec
index 277c01d..4e44406 100644
--- a/uim.spec
+++ b/uim.spec
@@ -16,6 +16,10 @@
 #
 
 
+%if ! %{defined _distconfdir}
+%define _distconfdir %{_sysconfdir}
+%endif
+
 Name:           uim
 Version:        1.8.8
 Release:        0
@@ -137,10 +141,10 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/gcroots.pc
 # touch it here to make sure that it is in the file list of the
 # package, then it will be deleted when the package is uninstalled:
 touch %{buildroot}%{_datadir}/uim/modules
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ja
+mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/ja
 install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-uim \
-               %{buildroot}%{_sysconfdir}/X11/xim.d/uim
-pushd  %{buildroot}%{_sysconfdir}/X11/xim.d/ja
+               %{buildroot}%{_distconfdir}/X11/xim.d/uim
+pushd  %{buildroot}%{_distconfdir}/X11/xim.d/ja
     ln -s ../uim 60-uim
 popd
 # GNU Emacs:
@@ -206,8 +210,7 @@ uim-module-manager --register \
 %license COPYING
 %doc AUTHORS NEWS* README*
 %doc doc
-%dir %{_sysconfdir}/X11/xim.d/
-%{_sysconfdir}/X11/xim.d/*
+%{_distconfdir}/X11/xim.d
 %{_datadir}/uim
 # autogenerated by uim-module-manager:
 %ghost %{_datadir}/uim/installed-modules.scm