Accepting request 851415 from home:MargueriteSu:branches:M17N

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

OBS-URL: https://build.opensuse.org/request/show/851415
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx5?expand=0&rev=10

fcitx5.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 28 05:12:34 UTC 2020 - Marguerite Su <i@marguerite.su>
+
+- Move the startup snippet to /usr/etc/X11/xim.d for TW
+
 -------------------------------------------------------------------
 Sun Nov  8 03:48:55 UTC 2020 - Marguerite Su <i@marguerite.su>
 

fcitx5.spec

@@ -15,6 +15,9 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+%if ! %{defined _distconfdir}
+%define _distconfdir %{_sysconfdir}
+%endif
 
 Name:           fcitx5
 Version:        5.0.1
@@ -136,11 +139,11 @@ rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/org.fcitx.Fcitx5.desktop
 ln -sf %{_datadir}/applications/org.fcitx.Fcitx5.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/
 
 # create autostart
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
-install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx
+mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/
+install -m 644 %{SOURCE3} %{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
@@ -184,7 +187,7 @@ install -Dm 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.fcitx5
 %files -f fcitx5.lang
 %doc README.md
 %license LICENSES
-%config %{_sysconfdir}/X11/xim.d/
+%{_distconfdir}/X11/xim.d/
 %{_sysconfdir}/xdg/autostart/org.fcitx.Fcitx5.desktop
 %{_bindir}/fcitx5
 %{_bindir}/fcitx5-configtool