From 2f0ed58209b476a1bbfd80dde34663c66c14d08a8766e9815735281e771e1590 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 28 Nov 2020 04:55:14 +0000 Subject: [PATCH 1/2] 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 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 From 536aa5e865e98ae0cd2e5deee7eea1ccc5c4735d6ef67b43e02f81ca8869a5ae Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 1 Dec 2020 07:06:46 +0000 Subject: [PATCH 2/2] Accepting request 852016 from home:MargueriteSu:branches:M17N - update version 4.2.9.8 * fix issue with appindicator on gnome-shell * Relicense the im module to BSD to allow Proprietary software for bundling it. This was already done for the Qt5 counter part, but never done for Qt4 version. This is mainly to allow WPS to reuse our up-to-date im module to support fcitx 5 * Slightly change to the tray menu to remove some redudant entries OBS-URL: https://build.opensuse.org/request/show/852016 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=159 --- fcitx-4.2.9.7_dict.tar.xz | 3 --- fcitx-4.2.9.7_dict.tar.xz.sig | Bin 310 -> 0 bytes fcitx-4.2.9.8_dict.tar.xz | 3 +++ fcitx-4.2.9.8_dict.tar.xz.sig | Bin 0 -> 310 bytes fcitx.changes | 13 +++++++++++++ fcitx.spec | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 fcitx-4.2.9.7_dict.tar.xz delete mode 100644 fcitx-4.2.9.7_dict.tar.xz.sig create mode 100644 fcitx-4.2.9.8_dict.tar.xz create mode 100644 fcitx-4.2.9.8_dict.tar.xz.sig diff --git a/fcitx-4.2.9.7_dict.tar.xz b/fcitx-4.2.9.7_dict.tar.xz deleted file mode 100644 index c9ae790..0000000 --- a/fcitx-4.2.9.7_dict.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf333b2a90be616ffed8b83438dfe3dc0e22ecf034b9f651167203ecbe3f6f8f -size 8734508 diff --git a/fcitx-4.2.9.7_dict.tar.xz.sig b/fcitx-4.2.9.7_dict.tar.xz.sig deleted file mode 100644 index 627568e5f38e36e7e18bff336f88e8e5bad6e57f07a59023dc43ea0077e77df8..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j*I$e>`F(xiFDTWws9i;0ZCBog@r0$sz{A^-{r5RQw9 zjK3rj`EddV{v&qvcBg51!D9JAQF46I_Qh3JFt$9Ou@Gmwi`S+8yW3)p`rB?Avz!J zW(^JY{Ibs#De+oG5awU}_B%lhhWazTXucn{*RkH2*DcS?A6>47QrIo0V$~b)=$I-R z#n7&TjjEz5RlE`X1=KquK1Y4GSe{<<13SE&@g;7o0i`FObUbQF9+2fUuM^@7%yrlx zcY;&*tz3KY7{~SOal~Pr@o`!Fa;>c^UT#7TprQoVa*ihK@qWNz&9;WQ9q`j{TZl9O I`Wsja^;Qv@7ytkO diff --git a/fcitx-4.2.9.8_dict.tar.xz b/fcitx-4.2.9.8_dict.tar.xz new file mode 100644 index 0000000..34cbf19 --- /dev/null +++ b/fcitx-4.2.9.8_dict.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6 +size 8737888 diff --git a/fcitx-4.2.9.8_dict.tar.xz.sig b/fcitx-4.2.9.8_dict.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..be90cfa23c1b38db487ef0608eb25191a4b6f0d9ca844677e741bc5f8bdf3d7e GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j*I$e>`F(xiFDTWws9i;0ZCBog@r0$(J_9{>so5RQw9 zjK3rj`TsKr0LyHABQcGDS9t1!EX3ZVI-NO50`_C>p<#cUY3Yn&1BG2l&tw9pV zsK%-L0EC6vHqcp^QTfwqI`aUc4&jkB)X&hdW+;-5FNse%4qd5@BZ+vuH%1N;ngH4r z7wEz}5|zFanQY1up>fk}%* + +- update version 4.2.9.8 + * fix issue with appindicator on gnome-shell + * Relicense the im module to BSD to allow Proprietary + software for bundling it. This was already done for + the Qt5 counter part, but never done for Qt4 version. + This is mainly to allow WPS to reuse our up-to-date + im module to support fcitx 5 + * Slightly change to the tray menu to remove some + redudant entries + ------------------------------------------------------------------- Thu Nov 26 16:48:21 CET 2020 - tiwai@suse.de diff --git a/fcitx.spec b/fcitx.spec index 44e5720..88f9509 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -22,7 +22,7 @@ %define libver -4_2_9 Name: fcitx -Version: 4.2.9.7 +Version: 4.2.9.8 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0-or-later