From 2f0ed58209b476a1bbfd80dde34663c66c14d08a8766e9815735281e771e1590 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Sat, 28 Nov 2020 04:55:14 +0000
Subject: [PATCH] Accepting request 851130 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/851130
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=158
---
 fcitx.changes |  5 +++++
 fcitx.spec    | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/fcitx.changes b/fcitx.changes
index 4e0a87e..71f0813 100644
--- a/fcitx.changes
+++ b/fcitx.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
+
 -------------------------------------------------------------------
 Sat Feb 29 15:14:52 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
 
diff --git a/fcitx.spec b/fcitx.spec
index e0c738f..44e5720 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -16,6 +16,10 @@
 #
 
 
+%if ! %{defined _distconfdir}
+%define _distconfdir %{_sysconfdir}
+%endif
+
 %define libver -4_2_9
 Name:           fcitx
 Version:        4.2.9.7
@@ -371,11 +375,11 @@ cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
 cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
 
 # create autostart
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx
+mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/
+install -m 644 %{SOURCE1} %{buildroot}%{_distconfdir}/X11/xim.d/fcitx
 
 priority=30
-pushd  %{buildroot}%{_sysconfdir}/X11/xim.d/
+pushd  %{buildroot}%{_distconfdir}/X11/xim.d/
     for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \
                 pa ru sk vi zh_TW zh_CN zh_HK zh_SG \
                 de fr it es nl cs pl da nn nb fi en sv ; do
@@ -446,7 +450,7 @@ exit 0
 %{_mandir}/man1/fcitx-remote.1%{?ext_man}
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/autostart/%{name}*.desktop
-%config %{_sysconfdir}/X11/xim.d/
+%{_distconfdir}/X11/xim.d
 %doc %{_docdir}/%{name}/
 
 # excludes