From 43fd7b82511fb4293ec9e48eb369736c4659d323 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 1 Sep 2020 09:08:05 +0800 Subject: [PATCH 01/88] Own /usr/share/fcitx5/inputmethod --- fcitx5.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index c60ba26..c2eb929 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -7,7 +7,7 @@ Name: fcitx5 Version: 0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: %{forgeurl} @@ -83,6 +83,7 @@ cp %{S:1} src/modules/spell/dict/ %install %cmake_install install -pm 644 -D %{S:2} %{buildroot}%{_xinputconf} +install -d %{buildroot}%{name}/inputmethod desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-configtool.desktop @@ -133,6 +134,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Sep 1 09:07:22 CST 2020 Qiyu Yan - 0-0.5.20200830git4706f37 +- Own /usr/share/fcitx5/inputmethod + * Sun Aug 30 23:39:20 CST 2020 Qiyu Yan - 0-0.4.20200830git4706f37 - rebuild to push to f32 From 7f5d4bed0ec480f7221c607a2a561582e10d699f Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 2 Sep 2020 08:45:10 +0800 Subject: [PATCH 02/88] Fix a typo --- fcitx5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index c2eb929..d179b13 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -7,7 +7,7 @@ Name: fcitx5 Version: 0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: %{forgeurl} @@ -83,7 +83,7 @@ cp %{S:1} src/modules/spell/dict/ %install %cmake_install install -pm 644 -D %{S:2} %{buildroot}%{_xinputconf} -install -d %{buildroot}%{name}/inputmethod +install -d %{buildroot}%{_datadir}/%{name}/inputmethod desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-configtool.desktop @@ -134,6 +134,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 +- Fix a typo + * Tue Sep 1 09:07:22 CST 2020 Qiyu Yan - 0-0.5.20200830git4706f37 - Own /usr/share/fcitx5/inputmethod From 53b2df5a54fdf36c029f01a935d6c8d7ba2e282b Mon Sep 17 00:00:00 2001 From: Karuboniru Date: Sat, 12 Sep 2020 11:58:44 +0800 Subject: [PATCH 03/88] - Drop imsetting - Update to commit aa7295e31abab177f9580c771c94cfd0589d11a3 - sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 --- .gitignore | 5 +++-- fcitx5.spec | 14 ++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9bee6ba..dd7496e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +results_*/ +*.rpm /en_dict-20121020.tar.gz -/fcitx5-87fb655852092f3ed2f79a3aac86fc6d5d92069f.tar.gz -/fcitx5-4706f37e60686d391a7f9a45ca1be6df6052ec4d.tar.gz +/fcitx5-*.tar.gz diff --git a/fcitx5.spec b/fcitx5.spec index d179b13..22fb5bd 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/fcitx/fcitx5 -%global commit 4706f37e60686d391a7f9a45ca1be6df6052ec4d +%global commit aa7295e31abab177f9580c771c94cfd0589d11a3 %forgemeta %global dictver 20121020 %global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx5.conf @@ -7,7 +7,7 @@ Name: fcitx5 Version: 0 -Release: 0.6%{?dist} +Release: 0.7%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: %{forgeurl} @@ -46,7 +46,7 @@ BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) Requires: dbus-x11 Requires: %{name}-data = %{version}-%{release} -Requires: imsettings +# Requires: imsettings Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives @@ -114,10 +114,11 @@ fi %{_bindir}/%{name} %{_bindir}/%{name}-configtool %{_bindir}/%{name}-remote +%{_bindir}/%{name}-diagnose %{_libdir}/%{name}/ %{_libdir}/libFcitx5*.so.*.* %{_libdir}/libFcitx5Config.so.6 -%{_libdir}/libFcitx5Core.so.6 +%{_libdir}/libFcitx5Core.so.7 %{_libdir}/libFcitx5Utils.so.2 %files devel @@ -134,6 +135,11 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Sep 12 2020 Karuboniru - 0-0.7 +- Drop imsetting +- Update to commit aa7295e31abab177f9580c771c94cfd0589d11a3 +- sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 + * Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 - Fix a typo From 40a61c7bdad88412e2ddd103024b2422b28943c0 Mon Sep 17 00:00:00 2001 From: Karuboniru Date: Sat, 12 Sep 2020 11:59:29 +0800 Subject: [PATCH 04/88] upload tarball --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 9121cb3..c4b28b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 SHA512 (fcitx5-4706f37e60686d391a7f9a45ca1be6df6052ec4d.tar.gz) = 323774d0a435c4f15316d6cbf1fd1bf3e504b1fb2029ab9001e88828aade4a90a7de724b131e015cc27d251c30a270ee6d9f38b2a43753caf52285463b725e1d +SHA512 (fcitx5-aa7295e31abab177f9580c771c94cfd0589d11a3.tar.gz) = 0e16be413ebce2aeb3bdd21bf9b8a281d28a5f7037ef870ae0d5dae8c4a076414cf3c84dc4b4952a14ddbad4cd64a68cf13f633c27e94ef22c6f7256fd008220 From 7cf35ec91a3b9f7a62020d4b6877d1b2a11daa5f Mon Sep 17 00:00:00 2001 From: Karuboniru Date: Sat, 12 Sep 2020 22:34:52 +0800 Subject: [PATCH 05/88] Update commit --- fcitx5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 22fb5bd..0d2a152 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/fcitx/fcitx5 -%global commit aa7295e31abab177f9580c771c94cfd0589d11a3 +%global commit d0383bc4a8e65e71189c18e31f7b832e543144c1 %forgemeta %global dictver 20121020 %global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx5.conf @@ -137,7 +137,7 @@ fi %changelog * Sat Sep 12 2020 Karuboniru - 0-0.7 - Drop imsetting -- Update to commit aa7295e31abab177f9580c771c94cfd0589d11a3 +- Update to commit d0383bc4a8e65e71189c18e31f7b832e543144c1 - sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 * Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 From cc691bed387e1cfd053184bb25178b1581c055b2 Mon Sep 17 00:00:00 2001 From: Karuboniru Date: Sat, 12 Sep 2020 22:40:32 +0800 Subject: [PATCH 06/88] upload source --- sources | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sources b/sources index c4b28b0..62e21ab 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 -SHA512 (fcitx5-4706f37e60686d391a7f9a45ca1be6df6052ec4d.tar.gz) = 323774d0a435c4f15316d6cbf1fd1bf3e504b1fb2029ab9001e88828aade4a90a7de724b131e015cc27d251c30a270ee6d9f38b2a43753caf52285463b725e1d -SHA512 (fcitx5-aa7295e31abab177f9580c771c94cfd0589d11a3.tar.gz) = 0e16be413ebce2aeb3bdd21bf9b8a281d28a5f7037ef870ae0d5dae8c4a076414cf3c84dc4b4952a14ddbad4cd64a68cf13f633c27e94ef22c6f7256fd008220 +SHA512 (fcitx5-d0383bc4a8e65e71189c18e31f7b832e543144c1.tar.gz) = 80f9fdbb15b1b4fa3464dd7ae5f0d823957738178c175aa3ebc0976023ebf1b952c0cfb5f43a459e9b8ecd1823822c215000547ef044534ef1b69775049d69d5 From bd1b4e07a6d3edf58114b6bb2564ce6e5d61d26a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 16 Sep 2020 21:34:17 +0800 Subject: [PATCH 07/88] update to 5415db391c1b84ea9964b0d508c053ae5c25e4aa --- fcitx5.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 0d2a152..8a68448 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/fcitx/fcitx5 -%global commit d0383bc4a8e65e71189c18e31f7b832e543144c1 +%global commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa %forgemeta %global dictver 20121020 %global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx5.conf @@ -7,7 +7,7 @@ Name: fcitx5 Version: 0 -Release: 0.7%{?dist} +Release: 0.8%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: %{forgeurl} @@ -135,6 +135,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Sep 16 2020 Qiyu Yan - 0-0.8 +- upstream commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa + * Sat Sep 12 2020 Karuboniru - 0-0.7 - Drop imsetting - Update to commit d0383bc4a8e65e71189c18e31f7b832e543144c1 diff --git a/sources b/sources index 62e21ab..29327f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 -SHA512 (fcitx5-d0383bc4a8e65e71189c18e31f7b832e543144c1.tar.gz) = 80f9fdbb15b1b4fa3464dd7ae5f0d823957738178c175aa3ebc0976023ebf1b952c0cfb5f43a459e9b8ecd1823822c215000547ef044534ef1b69775049d69d5 +SHA512 (fcitx5-5415db391c1b84ea9964b0d508c053ae5c25e4aa.tar.gz) = f352dce18fff1c619eebfeaa32586dd708f98207ecf628a9664462d5818ebf59ff852334dffe650189c531d27f8cb046c2327013c8f9627dde9604ec33106d80 From c02a090ecbcccfd7a60831ea599e0404402a5646 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 16 Oct 2020 17:30:28 +0800 Subject: [PATCH 08/88] - update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit --- fcitx5.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 8a68448..b2b1e73 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/fcitx/fcitx5 -%global commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa +%global commit dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 %forgemeta %global dictver 20121020 %global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx5.conf @@ -7,7 +7,7 @@ Name: fcitx5 Version: 0 -Release: 0.8%{?dist} +Release: 0.9%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: %{forgeurl} @@ -110,7 +110,7 @@ fi %files -f %{name}.lang %license LICENSES/LGPL-2.1-or-later.txt %doc README.md -%config(noreplace) %{_xinputconf} +%config %{_xinputconf} %{_bindir}/%{name} %{_bindir}/%{name}-configtool %{_bindir}/%{name}-remote @@ -135,6 +135,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Oct 16 2020 Qiyu Yan - 0-0.9.20201016gitdd9dc94 +- update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit + * Wed Sep 16 2020 Qiyu Yan - 0-0.8 - upstream commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa diff --git a/sources b/sources index 29327f2..d1cfd57 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 -SHA512 (fcitx5-5415db391c1b84ea9964b0d508c053ae5c25e4aa.tar.gz) = f352dce18fff1c619eebfeaa32586dd708f98207ecf628a9664462d5818ebf59ff852334dffe650189c531d27f8cb046c2327013c8f9627dde9604ec33106d80 +SHA512 (fcitx5-dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0.tar.gz) = 07643bc56db31cd0a6394147eeaeaf7a5dd986633043ec58528dd951fa3789068958e47867b328ef7e39fb1c34f1877981b2552ee593cadbea9c6a86db850695 From 07efc8e4fbeb2edbfa97ebf9a2e6525b8354442f Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 31 Oct 2020 22:03:05 +0800 Subject: [PATCH 09/88] update to upstream comit a5a0551a22971738283fc4812d2afe77efb626e3 --- fcitx5.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index b2b1e73..2d54990 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/fcitx/fcitx5 -%global commit dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 +%global commit a5a0551a22971738283fc4812d2afe77efb626e3 %forgemeta %global dictver 20121020 %global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx5.conf @@ -7,7 +7,7 @@ Name: fcitx5 Version: 0 -Release: 0.9%{?dist} +Release: 0.10%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: %{forgeurl} @@ -130,11 +130,16 @@ fi %files data %{_datadir}/%{name} +%{_datadir}/dbus-1/services/org.fcitx.Fcitx5.service %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}-configtool.desktop %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Oct 31 22:01:00 CST 2020 Qiyu Yan - 0-0.10 +- update to a5a0551a22971738283fc4812d2afe77efb626e3 upstream commit +- upstream added dbus service + * Fri Oct 16 2020 Qiyu Yan - 0-0.9.20201016gitdd9dc94 - update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit diff --git a/sources b/sources index d1cfd57..a10aee9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 -SHA512 (fcitx5-dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0.tar.gz) = 07643bc56db31cd0a6394147eeaeaf7a5dd986633043ec58528dd951fa3789068958e47867b328ef7e39fb1c34f1877981b2552ee593cadbea9c6a86db850695 +SHA512 (fcitx5-a5a0551a22971738283fc4812d2afe77efb626e3.tar.gz) = 30fbd6a6ac1905670da9a828c8db4abb53b5d4cd7c4ebc38105fb5d8e814820b0740d578b1b185cf4b68600fdad481313be701dfc41bf403bca2baf16daf7098 From eabb453787527a2d3118ca41520ea8c00b566b8b Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 3 Nov 2020 18:02:13 +0800 Subject: [PATCH 10/88] update to 5.0.1 upstream release --- .gitignore | 3 +++ fcitx5.spec | 38 ++++++++++++++++++++------------------ sources | 5 +++-- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index dd7496e..84c6b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ results_*/ *.rpm /en_dict-20121020.tar.gz /fcitx5-*.tar.gz +/fcitx5-5.0.1_dict.tar.xz +/fcitx5-5.0.1_dict.tar.xz.sig +/0x8E8B898CBF2412F9 diff --git a/fcitx5.spec b/fcitx5.spec index 2d54990..98769b7 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -1,22 +1,21 @@ -%global forgeurl https://github.com/fcitx/fcitx5 -%global commit a5a0551a22971738283fc4812d2afe77efb626e3 -%forgemeta -%global dictver 20121020 %global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx5.conf %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 0 -Release: 0.10%{?dist} +Version: 5.0.1 +Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ -URL: %{forgeurl} -Source: %{forgesource} -Source1: https://download.fcitx-im.org/data/en_dict-%{dictver}.tar.gz -Source2: fcitx5-xinput - +URL: https://github.com/fcitx/fcitx5 +Source: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.xz +Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.xz.sig +# Checked by chatting, this key is used to verify fcitx* tarballs +Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 +Source3: fcitx5-xinput BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: gnupg2 BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ @@ -46,7 +45,6 @@ BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) Requires: dbus-x11 Requires: %{name}-data = %{version}-%{release} -# Requires: imsettings Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives @@ -73,16 +71,16 @@ The %{name}-devel package contains libraries and header files necessary for developing programs using Fcitx5 libraries. %prep -%forgesetup -cp %{S:1} src/modules/spell/dict/ +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup %build -%cmake +%cmake -DENABLE_XDGAUTOSTART=False -GNinja %cmake_build %install %cmake_install -install -pm 644 -D %{S:2} %{buildroot}%{_xinputconf} +install -pm 644 -D %{S:3} %{buildroot}%{_xinputconf} install -d %{buildroot}%{_datadir}/%{name}/inputmethod desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ @@ -90,7 +88,7 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}.desktop + %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop %find_lang %{name} @@ -131,11 +129,15 @@ fi %files data %{_datadir}/%{name} %{_datadir}/dbus-1/services/org.fcitx.Fcitx5.service -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/org.fcitx.Fcitx5.desktop +%{_datadir}/metainfo/org.fcitx.Fcitx5.metainfo.xml %{_datadir}/applications/%{name}-configtool.desktop %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Nov 3 18:00:49 CST 2020 Qiyu Yan - 5.0.1-1 +- update to 5.0.1 upstream release + * Sat Oct 31 22:01:00 CST 2020 Qiyu Yan - 0-0.10 - update to a5a0551a22971738283fc4812d2afe77efb626e3 upstream commit - upstream added dbus service diff --git a/sources b/sources index a10aee9..19bb3b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 -SHA512 (fcitx5-a5a0551a22971738283fc4812d2afe77efb626e3.tar.gz) = 30fbd6a6ac1905670da9a828c8db4abb53b5d4cd7c4ebc38105fb5d8e814820b0740d578b1b185cf4b68600fdad481313be701dfc41bf403bca2baf16daf7098 +SHA512 (fcitx5-5.0.1_dict.tar.xz) = e9889c1f684f7bda029e73b117df6ac440a9f8f3ede15e9791a723f4771c0596151596d216b209b99cb12cad0f0d822171f6145c4da40fc25ce3e34f0d4fcdd9 +SHA512 (fcitx5-5.0.1_dict.tar.xz.sig) = 176afef363ee399d503ac61a0245ce1713fd30c7fff71d9baafc006d35e67bd05d586cb164e21c66a554f9d56a9970a2bd8a7d23bd10a2bfe6e41db058ef0267 +SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279 From d8dee114c7843ad7c292daff89bfd43f7b576d5d Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 3 Nov 2020 21:21:58 +0800 Subject: [PATCH 11/88] add fcitx5-autostart package to auto setup env and autostart --- fcitx5.sh | 7 +++++++ fcitx5.spec | 27 ++++++++++++++++++++++++--- path_fix.patch | 25 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100755 fcitx5.sh create mode 100644 path_fix.patch diff --git a/fcitx5.sh b/fcitx5.sh new file mode 100755 index 0000000..062bff9 --- /dev/null +++ b/fcitx5.sh @@ -0,0 +1,7 @@ +if [ ! "$XDG_SESSION_TYPE" = "tty" ] # if this is a gui session (not tty) +then + export INPUT_METHOD=fcitx5 + export GTK_IM_MODULE=fcitx5 + export QT_IM_MODULE=fcitx5 + export XMODIFIERS=@im=fcitx5 +fi \ No newline at end of file diff --git a/fcitx5.spec b/fcitx5.spec index 98769b7..8289aba 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -12,6 +12,10 @@ Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_di # Checked by chatting, this key is used to verify fcitx* tarballs Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput +Source4: fcitx5.sh + +# https://github.com/fcitx/fcitx5/pull/136 +Patch0: path_fix.patch BuildRequires: cmake BuildRequires: ninja-build @@ -45,6 +49,7 @@ BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) Requires: dbus-x11 Requires: %{name}-data = %{version}-%{release} +Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives @@ -70,17 +75,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files necessary for developing programs using Fcitx5 libraries. +%package autostart +Summary: This package will make fcitx5 start with your GUI session +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description autostart +This package will setup autostart and environment needed for fcitx5 to work properly. + %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup +%autosetup -p1 %build -%cmake -DENABLE_XDGAUTOSTART=False -GNinja +%cmake -GNinja %cmake_build %install %cmake_install install -pm 644 -D %{S:3} %{buildroot}%{_xinputconf} +install -pm 644 -D %{S:4} %{buildroot}%{_sysconfdir}/profile.d/fcitx5.sh install -d %{buildroot}%{_datadir}/%{name}/inputmethod desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ @@ -134,7 +148,14 @@ fi %{_datadir}/applications/%{name}-configtool.desktop %{_datadir}/icons/hicolor/*/apps/* +%files autostart +%config %{_sysconfdir}/xdg/autostart/org.fcitx.Fcitx5.desktop +%config %{_sysconfdir}/profile.d/fcitx5.sh + %changelog +* Tue Nov 3 21:20:30 CST 2020 Qiyu Yan - 5.0.1-2 +- add fcitx5-autostart package to auto setup env and autostart + * Tue Nov 3 18:00:49 CST 2020 Qiyu Yan - 5.0.1-1 - update to 5.0.1 upstream release diff --git a/path_fix.patch b/path_fix.patch new file mode 100644 index 0000000..41ac3e8 --- /dev/null +++ b/path_fix.patch @@ -0,0 +1,25 @@ +From a81a171461f333b4c50fd03db64a949ac8ebe52e Mon Sep 17 00:00:00 2001 +From: Qiyu Yan +Date: Tue, 3 Nov 2020 20:33:31 +0800 +Subject: [PATCH] Fix default autostart file path + +--- + data/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 1d1cc08..8bfba95 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -17,7 +17,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" + DESTINATION "${FCITX_INSTALL_DATADIR}/applications") + + if (ENABLE_XDGAUTOSTART) +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/xdg/autostart) ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart) + endif() + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.metainfo.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) +-- +2.28.0 + From 49f457ff3af5d04eac6999b87fda2b80089a1579 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 5 Dec 2020 13:51:09 +0800 Subject: [PATCH 12/88] update to 5.0.2 upstream release --- .gitignore | 2 ++ fcitx5.spec | 10 +++++----- path_fix.patch | 25 ------------------------- sources | 4 ++-- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 path_fix.patch diff --git a/.gitignore b/.gitignore index 84c6b4e..6a624c6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ results_*/ /fcitx5-5.0.1_dict.tar.xz /fcitx5-5.0.1_dict.tar.xz.sig /0x8E8B898CBF2412F9 +/fcitx5-5.0.2_dict.tar.xz +/fcitx5-5.0.2_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 8289aba..19c4950 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -14,9 +14,6 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh -# https://github.com/fcitx/fcitx5/pull/136 -Patch0: path_fix.patch - BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 @@ -153,6 +150,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Sat Dec 5 13:30:48 CST 2020 Qiyu Yan - 5.0.2-1 +- Update to 5.0.2 upstream release + * Tue Nov 3 21:20:30 CST 2020 Qiyu Yan - 5.0.1-2 - add fcitx5-autostart package to auto setup env and autostart diff --git a/path_fix.patch b/path_fix.patch deleted file mode 100644 index 41ac3e8..0000000 --- a/path_fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a81a171461f333b4c50fd03db64a949ac8ebe52e Mon Sep 17 00:00:00 2001 -From: Qiyu Yan -Date: Tue, 3 Nov 2020 20:33:31 +0800 -Subject: [PATCH] Fix default autostart file path - ---- - data/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1d1cc08..8bfba95 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -17,7 +17,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" - DESTINATION "${FCITX_INSTALL_DATADIR}/applications") - - if (ENABLE_XDGAUTOSTART) -- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/xdg/autostart) -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart) - endif() - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.metainfo.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) --- -2.28.0 - diff --git a/sources b/sources index 19bb3b2..5c699e5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fcitx5-5.0.1_dict.tar.xz) = e9889c1f684f7bda029e73b117df6ac440a9f8f3ede15e9791a723f4771c0596151596d216b209b99cb12cad0f0d822171f6145c4da40fc25ce3e34f0d4fcdd9 -SHA512 (fcitx5-5.0.1_dict.tar.xz.sig) = 176afef363ee399d503ac61a0245ce1713fd30c7fff71d9baafc006d35e67bd05d586cb164e21c66a554f9d56a9970a2bd8a7d23bd10a2bfe6e41db058ef0267 +SHA512 (fcitx5-5.0.2_dict.tar.xz) = e9f7caeaf631f45d2eba3727674815e46ae3406f9beaae68fb738ed692f5685798c28fd90fff3c0109b4b9b9d6b45320321cc4ab0a75d15a2b59dc2c167f0869 +SHA512 (fcitx5-5.0.2_dict.tar.xz.sig) = 6869ecdb2d3aa526022643d8e5a02e796c6d1ec11a49eb4a37b26720e255f813f4f122181a902f4224f3835b24566a652736a8d3a3ffb0f1f13785b7e643c612 SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279 From 862cb25940e53a176902855e9602244b749af4f1 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 5 Dec 2020 15:14:25 +0800 Subject: [PATCH 13/88] add weak dep to im-modules --- fcitx5.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index 19c4950..93ea8d4 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -50,6 +50,10 @@ Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives +Suggests: fcitx5-gtk +Suggests: fcitx5-qt +Suggests: fcitx5-qt-module + %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. @@ -150,6 +154,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Sat Dec 5 15:14:08 CST 2020 Qiyu Yan - 5.0.2-2 +- add weak dep to im-modules + * Sat Dec 5 13:30:48 CST 2020 Qiyu Yan - 5.0.2-1 - Update to 5.0.2 upstream release From d0489ca7554acc49cd30ff5c87d5720efb61482b Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 7 Dec 2020 11:10:00 +0800 Subject: [PATCH 14/88] update to 5.0.3 upstream release --- .gitignore | 2 ++ 0001-add-missing-headers.patch | 24 ++++++++++++++++++++++++ fcitx5.spec | 10 ++++++++-- sources | 4 ++-- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 0001-add-missing-headers.patch diff --git a/.gitignore b/.gitignore index 6a624c6..258dbe9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ results_*/ /0x8E8B898CBF2412F9 /fcitx5-5.0.2_dict.tar.xz /fcitx5-5.0.2_dict.tar.xz.sig +/fcitx5-5.0.3_dict.tar.xz +/fcitx5-5.0.3_dict.tar.xz.sig diff --git a/0001-add-missing-headers.patch b/0001-add-missing-headers.patch new file mode 100644 index 0000000..6eaec4a --- /dev/null +++ b/0001-add-missing-headers.patch @@ -0,0 +1,24 @@ +From a9f99c874584e7f42051f7ae05338baf1316677a Mon Sep 17 00:00:00 2001 +From: Qiyu Yan +Date: Mon, 7 Dec 2020 10:51:02 +0800 +Subject: [PATCH] add missing headers + +--- + src/lib/fcitx/icontheme.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/fcitx/icontheme.cpp b/src/lib/fcitx/icontheme.cpp +index 60a0366..13c5360 100644 +--- a/src/lib/fcitx/icontheme.cpp ++++ b/src/lib/fcitx/icontheme.cpp +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include "fcitx-config/iniparser.h" + #include "fcitx-config/marshallfunction.h" + #include "fcitx-utils/fs.h" +-- +2.29.2 + diff --git a/fcitx5.spec b/fcitx5.spec index 93ea8d4..da8de63 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.2 -Release: 2%{?dist} +Version: 5.0.3 +Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -14,6 +14,9 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh +# See: https://github.com/fcitx/fcitx5/pull/166 +Patch0: 0001-add-missing-headers.patch + BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 @@ -154,6 +157,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Mon Dec 7 10:40:52 CST 2020 Qiyu Yan - 5.0.3-1 +- Update to 5.0.3 upstream release + * Sat Dec 5 15:14:08 CST 2020 Qiyu Yan - 5.0.2-2 - add weak dep to im-modules diff --git a/sources b/sources index 5c699e5..a97b13e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fcitx5-5.0.2_dict.tar.xz) = e9f7caeaf631f45d2eba3727674815e46ae3406f9beaae68fb738ed692f5685798c28fd90fff3c0109b4b9b9d6b45320321cc4ab0a75d15a2b59dc2c167f0869 -SHA512 (fcitx5-5.0.2_dict.tar.xz.sig) = 6869ecdb2d3aa526022643d8e5a02e796c6d1ec11a49eb4a37b26720e255f813f4f122181a902f4224f3835b24566a652736a8d3a3ffb0f1f13785b7e643c612 +SHA512 (fcitx5-5.0.3_dict.tar.xz) = c3bf9ca9c43c91416e437b7cb94033518e7a33ccd4a58974abe12e87d7f4541e4f277ac5eb98ec65ff8b91ebdc61d3577fdefd871b9a4f18eff9d0c68b8942dc +SHA512 (fcitx5-5.0.3_dict.tar.xz.sig) = f9b030939d1efc453bab20e6cb3937bda22ee94abcbf13c0b0dd2716c6685ddce186a17f9f91f5d445df4b33c6e358c7fad707961f7cef4741d447cfea5e1053 SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279 From ce247dcbce7be1334f9e264d6d0c564d251078e8 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 9 Dec 2020 00:26:36 +0800 Subject: [PATCH 15/88] explicit Conflicts against fcitx-data --- fcitx5.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index da8de63..0eede2c 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -57,6 +57,10 @@ Suggests: fcitx5-gtk Suggests: fcitx5-qt Suggests: fcitx5-qt-module +# upstream introduces some conflicting files, +# contacting upstream for a good solution. +Conflicts: fcitx-data + %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. @@ -157,6 +161,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Wed Dec 9 00:25:45 CST 2020 Qiyu Yan - 5.0.3-2 +- explicit Conflicts against fcitx-data + * Mon Dec 7 10:40:52 CST 2020 Qiyu Yan - 5.0.3-1 - Update to 5.0.3 upstream release From 01e4b188271a3987bbb4ec11cf1b197e24c4e885 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 11 Dec 2020 16:50:04 +0800 Subject: [PATCH 16/88] fix conlict with fcitx4 --- fcitx5.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 0eede2c..2a0cc19 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -57,10 +57,6 @@ Suggests: fcitx5-gtk Suggests: fcitx5-qt Suggests: fcitx5-qt-module -# upstream introduces some conflicting files, -# contacting upstream for a good solution. -Conflicts: fcitx-data - %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. @@ -111,6 +107,15 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop + +# convert symlinked icons to copied icons, this will help co-existing with +# fcitx4 +for iconfile in $(find %{buildroot}%{_datadir}/icons -type l) +do + origicon=$(readlink -f ${iconfile}) + rm -f ${iconfile} + cp ${origicon} ${iconfile} +done %find_lang %{name} @@ -161,6 +166,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Fri Dec 11 16:49:42 CST 2020 Qiyu Yan - 5.0.3-3 +- fix conlict with fcitx4 + * Wed Dec 9 00:25:45 CST 2020 Qiyu Yan - 5.0.3-2 - explicit Conflicts against fcitx-data From 8dcdb04518754ee800461f3c394101725a5b1cb9 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 12 Jan 2021 22:15:43 +0800 Subject: [PATCH 17/88] update to 5.0.4 upstream release --- .gitignore | 2 ++ 0001-add-missing-headers.patch | 24 ------------------------ fcitx5.spec | 10 +++++----- sources | 4 ++-- 4 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 0001-add-missing-headers.patch diff --git a/.gitignore b/.gitignore index 258dbe9..c2981b9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ results_*/ /fcitx5-5.0.2_dict.tar.xz.sig /fcitx5-5.0.3_dict.tar.xz /fcitx5-5.0.3_dict.tar.xz.sig +/fcitx5-5.0.4_dict.tar.xz +/fcitx5-5.0.4_dict.tar.xz.sig diff --git a/0001-add-missing-headers.patch b/0001-add-missing-headers.patch deleted file mode 100644 index 6eaec4a..0000000 --- a/0001-add-missing-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a9f99c874584e7f42051f7ae05338baf1316677a Mon Sep 17 00:00:00 2001 -From: Qiyu Yan -Date: Mon, 7 Dec 2020 10:51:02 +0800 -Subject: [PATCH] add missing headers - ---- - src/lib/fcitx/icontheme.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/fcitx/icontheme.cpp b/src/lib/fcitx/icontheme.cpp -index 60a0366..13c5360 100644 ---- a/src/lib/fcitx/icontheme.cpp -+++ b/src/lib/fcitx/icontheme.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include "fcitx-config/iniparser.h" - #include "fcitx-config/marshallfunction.h" - #include "fcitx-utils/fs.h" --- -2.29.2 - diff --git a/fcitx5.spec b/fcitx5.spec index 2a0cc19..d2bf4fe 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.3 -Release: 3%{?dist} +Version: 5.0.4 +Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -14,9 +14,6 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh -# See: https://github.com/fcitx/fcitx5/pull/166 -Patch0: 0001-add-missing-headers.patch - BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 @@ -166,6 +163,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Tue Jan 12 21:48:18 CST 2021 yan - 5.0.4-1 +- update to 5.0.4 upstream release + * Fri Dec 11 16:49:42 CST 2020 Qiyu Yan - 5.0.3-3 - fix conlict with fcitx4 diff --git a/sources b/sources index a97b13e..703cd88 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fcitx5-5.0.3_dict.tar.xz) = c3bf9ca9c43c91416e437b7cb94033518e7a33ccd4a58974abe12e87d7f4541e4f277ac5eb98ec65ff8b91ebdc61d3577fdefd871b9a4f18eff9d0c68b8942dc -SHA512 (fcitx5-5.0.3_dict.tar.xz.sig) = f9b030939d1efc453bab20e6cb3937bda22ee94abcbf13c0b0dd2716c6685ddce186a17f9f91f5d445df4b33c6e358c7fad707961f7cef4741d447cfea5e1053 +SHA512 (fcitx5-5.0.4_dict.tar.xz) = 69bb3f7bbc9edee375c59838d6ccc339775d73b140db7ce636e8bd9ca3d1606d047789b3e783e2ce56c43f685c5ea847950a3b12b7df273e6e832638b2a202a0 +SHA512 (fcitx5-5.0.4_dict.tar.xz.sig) = 24b571366f6079b897b8a896314404f6de93cdd8ed2d243edb28c978b0ce92bcd3aa5185195a6daf34d3d496a26e4839c7b0e2f39783b08531513d12d8240712 SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279 From 1ddee7ea0ad056740ca9f15eba06359740dc092e Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 13 Jan 2021 23:07:47 +0800 Subject: [PATCH 18/88] conditional suggests --- fcitx5.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index d2bf4fe..b28bc71 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -50,9 +50,9 @@ Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives -Suggests: fcitx5-gtk -Suggests: fcitx5-qt -Suggests: fcitx5-qt-module +Suggests: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) +Suggests: (fcitx5-qt if qt5-qtbase) +Suggests: (fcitx5-qt-module if qt5-qtbase) %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. @@ -163,6 +163,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Wed Jan 13 12:19:25 CST 2021 Qiyu Yan - 5.0.4-2 +- use conditional suggests + * Tue Jan 12 21:48:18 CST 2021 yan - 5.0.4-1 - update to 5.0.4 upstream release From a45b29a31e677e9cac973f6027b4b7dd26ef79d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:19:15 +0000 Subject: [PATCH 19/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcitx5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index b28bc71..41b542b 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -163,6 +163,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 12:19:25 CST 2021 Qiyu Yan - 5.0.4-2 - use conditional suggests From 5b30eb89069fc80423bf3be7e8d68be3cebbd2a7 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 20 Feb 2021 11:03:11 +0800 Subject: [PATCH 20/88] update to 5.0.5 upstream release --- .gitignore | 2 ++ fcitx5.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c2981b9..fa26f37 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ results_*/ /fcitx5-5.0.3_dict.tar.xz.sig /fcitx5-5.0.4_dict.tar.xz /fcitx5-5.0.4_dict.tar.xz.sig +/fcitx5-5.0.5_dict.tar.xz +/fcitx5-5.0.5_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 41b542b..b3b88d5 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.4 -Release: 3%{?dist} +Version: 5.0.5 +Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -97,6 +97,7 @@ This package will setup autostart and environment needed for fcitx5 to work prop install -pm 644 -D %{S:3} %{buildroot}%{_xinputconf} install -pm 644 -D %{S:4} %{buildroot}%{_sysconfdir}/profile.d/fcitx5.sh install -d %{buildroot}%{_datadir}/%{name}/inputmethod +install -d %{buildroot}%{_datadir}/%{name}/table desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-configtool.desktop @@ -163,6 +164,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Sat Feb 20 2021 Qiyu Yan - 5.0.5-1 +- update to 5.0.5 upstream release + * Tue Jan 26 2021 Fedora Release Engineering - 5.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 703cd88..efd4d0c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fcitx5-5.0.4_dict.tar.xz) = 69bb3f7bbc9edee375c59838d6ccc339775d73b140db7ce636e8bd9ca3d1606d047789b3e783e2ce56c43f685c5ea847950a3b12b7df273e6e832638b2a202a0 -SHA512 (fcitx5-5.0.4_dict.tar.xz.sig) = 24b571366f6079b897b8a896314404f6de93cdd8ed2d243edb28c978b0ce92bcd3aa5185195a6daf34d3d496a26e4839c7b0e2f39783b08531513d12d8240712 +SHA512 (fcitx5-5.0.5_dict.tar.xz) = f9224ccc94350bc57e4d843601ffa27211ebed8c06a2306aa5bc19c345ee7e024a46cefbc99135cde2df9a8f177085dee47e726ddc598521b1a6799ee78d8d23 +SHA512 (fcitx5-5.0.5_dict.tar.xz.sig) = a069f54edb5445f4d4f7d7dd78a8f97e43d555e8bc35890c7e18e6d4fc0e246c3647386e0945b2ff9cc96bb50d6a30dec1ba4e3ecbb9cb15d6c88fa513ae7072 SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279 From 16daec9abe66d36901bb1c62056939b561b8e1fd Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 11 Mar 2021 00:05:31 +0800 Subject: [PATCH 21/88] validate metadata files --- fcitx5.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index b3b88d5..ec844f3 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -44,6 +44,7 @@ BuildRequires: pkgconfig(xcb-imdkit) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) +BuildRequires: /usr/bin/appstream-util Requires: dbus-x11 Requires: %{name}-data = %{version}-%{release} Requires: setup @@ -114,7 +115,7 @@ do rm -f ${iconfile} cp ${origicon} ${iconfile} done - +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %find_lang %{name} %check @@ -155,7 +156,7 @@ fi %{_datadir}/%{name} %{_datadir}/dbus-1/services/org.fcitx.Fcitx5.service %{_datadir}/applications/org.fcitx.Fcitx5.desktop -%{_datadir}/metainfo/org.fcitx.Fcitx5.metainfo.xml +%{_metainfodir}/org.fcitx.Fcitx5.metainfo.xml %{_datadir}/applications/%{name}-configtool.desktop %{_datadir}/icons/hicolor/*/apps/* From 8ea5fed35249416c8661152924dcf358de2155f2 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Mar 2021 13:23:11 +0800 Subject: [PATCH 22/88] Update to 5.0.6 upstream release --- .gitignore | 3 +- 0x8E8B898CBF2412F9 | 112 +++++++++++++++++++++++++++++++++++++++++++++ fcitx5.spec | 5 +- sources | 5 +- 4 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 0x8E8B898CBF2412F9 diff --git a/.gitignore b/.gitignore index fa26f37..258e3b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ results_*/ /fcitx5-*.tar.gz /fcitx5-5.0.1_dict.tar.xz /fcitx5-5.0.1_dict.tar.xz.sig -/0x8E8B898CBF2412F9 /fcitx5-5.0.2_dict.tar.xz /fcitx5-5.0.2_dict.tar.xz.sig /fcitx5-5.0.3_dict.tar.xz @@ -13,3 +12,5 @@ results_*/ /fcitx5-5.0.4_dict.tar.xz.sig /fcitx5-5.0.5_dict.tar.xz /fcitx5-5.0.5_dict.tar.xz.sig +/fcitx5-5.0.6_dict.tar.xz +/fcitx5-5.0.6_dict.tar.xz.sig diff --git a/0x8E8B898CBF2412F9 b/0x8E8B898CBF2412F9 new file mode 100644 index 0000000..d9449d8 --- /dev/null +++ b/0x8E8B898CBF2412F9 @@ -0,0 +1,112 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.6 +Comment: Hostname: carles.tubio.sks-database_1 + +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 +T4QJqjlzditPN/CwH8xZ1ZoPBpZ4 +=Olqg +-----END PGP PUBLIC KEY BLOCK----- diff --git a/fcitx5.spec b/fcitx5.spec index ec844f3..2784145 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.5 +Version: 5.0.6 Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ @@ -165,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Mon Mar 22 2021 Qiyu Yan - 5.0.6-1 +- Update to 5.0.6 upstream release + * Sat Feb 20 2021 Qiyu Yan - 5.0.5-1 - update to 5.0.5 upstream release diff --git a/sources b/sources index efd4d0c..c31b21c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (fcitx5-5.0.5_dict.tar.xz) = f9224ccc94350bc57e4d843601ffa27211ebed8c06a2306aa5bc19c345ee7e024a46cefbc99135cde2df9a8f177085dee47e726ddc598521b1a6799ee78d8d23 -SHA512 (fcitx5-5.0.5_dict.tar.xz.sig) = a069f54edb5445f4d4f7d7dd78a8f97e43d555e8bc35890c7e18e6d4fc0e246c3647386e0945b2ff9cc96bb50d6a30dec1ba4e3ecbb9cb15d6c88fa513ae7072 -SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279 +SHA512 (fcitx5-5.0.6_dict.tar.xz) = 7689b15b1a8a7bd07229ceef0c9c0738de950c5690073d6f7f085a4aa173ca60f507d74c8785e70b18b4662a7dad7bf20df1343c84268647491e8e4c56b503b0 +SHA512 (fcitx5-5.0.6_dict.tar.xz.sig) = 5688f5a1958f4be285f9aad393250ee36938a6e65247d44bd2546534511148a27123efcb44d5402fb5147398945f3f0aea2ae439558733a5e4f0eefbee2b9fe0 From be1f6536073de7d82855c56df5a976728bcd3586 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Mar 2021 13:48:15 +0800 Subject: [PATCH 23/88] change Requires --- fcitx5.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 2784145..47c4823 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -51,9 +51,9 @@ Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives -Suggests: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) -Suggests: (fcitx5-qt if qt5-qtbase) -Suggests: (fcitx5-qt-module if qt5-qtbase) +Requires: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) +Requires: (fcitx5-qt if qt5-qtbase) +Requires: (fcitx5-qt-module if qt5-qtbase) %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. From 11ae61d8ede2ee5338c13ec0685158704c94ce84 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Mar 2021 16:51:19 +0800 Subject: [PATCH 24/88] fix test failure --- 0001-fix-testsemver.patch | 27 +++++++++++++++++++++++++++ fcitx5.spec | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 0001-fix-testsemver.patch diff --git a/0001-fix-testsemver.patch b/0001-fix-testsemver.patch new file mode 100644 index 0000000..75493d6 --- /dev/null +++ b/0001-fix-testsemver.patch @@ -0,0 +1,27 @@ +From 9c811be8ae551828f2db3e7f66e6057b0b3e6a1c Mon Sep 17 00:00:00 2001 +From: Qiyu Yan +Date: Mon, 22 Mar 2021 16:45:00 +0800 +Subject: [PATCH] fix testsemver + +--- + src/lib/fcitx-utils/semver.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/lib/fcitx-utils/semver.cpp b/src/lib/fcitx-utils/semver.cpp +index 290a69a..c682dd9 100644 +--- a/src/lib/fcitx-utils/semver.cpp ++++ b/src/lib/fcitx-utils/semver.cpp +@@ -213,6 +213,10 @@ std::optional SemanticVersion::parse(std::string_view data) { + } + } + ++ if (data.empty()) { ++ return version; ++ } ++ + if (data[0] == '+') { + data.remove_prefix(1); + if (auto result = consumeBuild(data)) { +-- +2.30.2 + diff --git a/fcitx5.spec b/fcitx5.spec index 47c4823..82b8382 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -14,6 +14,8 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh +Patch0: 0001-fix-testsemver.patch + BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 From e63f2fba8ecf5c2aeeca6b8f7fc1464761a3be1b Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 23 Mar 2021 11:02:56 +0800 Subject: [PATCH 25/88] Update to 5.0.7 upstream release --- .gitignore | 2 ++ fcitx5.spec | 7 ++++--- sources | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 258e3b3..b2eca5f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ results_*/ /fcitx5-5.0.5_dict.tar.xz.sig /fcitx5-5.0.6_dict.tar.xz /fcitx5-5.0.6_dict.tar.xz.sig +/fcitx5-5.0.7_dict.tar.xz +/fcitx5-5.0.7_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 82b8382..5694380 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.6 +Version: 5.0.7 Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ @@ -14,8 +14,6 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh -Patch0: 0001-fix-testsemver.patch - BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 @@ -167,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Tue Mar 23 2021 Qiyu Yan - 5.0.7-1 +- Update to 5.0.7 upstream release + * Mon Mar 22 2021 Qiyu Yan - 5.0.6-1 - Update to 5.0.6 upstream release diff --git a/sources b/sources index c31b21c..dbd30ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.6_dict.tar.xz) = 7689b15b1a8a7bd07229ceef0c9c0738de950c5690073d6f7f085a4aa173ca60f507d74c8785e70b18b4662a7dad7bf20df1343c84268647491e8e4c56b503b0 -SHA512 (fcitx5-5.0.6_dict.tar.xz.sig) = 5688f5a1958f4be285f9aad393250ee36938a6e65247d44bd2546534511148a27123efcb44d5402fb5147398945f3f0aea2ae439558733a5e4f0eefbee2b9fe0 +SHA512 (fcitx5-5.0.7_dict.tar.xz) = d85eea0a394d04fdba7841d29e2f918e6697a91c4b25bedc9b1b02349f179bcd9048e5c38246073de548e44fc21cc786b6474c51e1eae473579faa6cfdf01840 +SHA512 (fcitx5-5.0.7_dict.tar.xz.sig) = f58f9ed3c73d3b2605a63b05aa79239b3356781e7a069d8f3f5c4d44b7ffa357b90982f58ca18148c21082efab4b7e4c7c5acc2153df8000e90e6ad867c807f4 From 4395a6e3fa226dbb7883c4c96a67bdc58d9d2d32 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 23 Mar 2021 11:32:52 +0800 Subject: [PATCH 26/88] remove merged patch --- 0001-fix-testsemver.patch | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 0001-fix-testsemver.patch diff --git a/0001-fix-testsemver.patch b/0001-fix-testsemver.patch deleted file mode 100644 index 75493d6..0000000 --- a/0001-fix-testsemver.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9c811be8ae551828f2db3e7f66e6057b0b3e6a1c Mon Sep 17 00:00:00 2001 -From: Qiyu Yan -Date: Mon, 22 Mar 2021 16:45:00 +0800 -Subject: [PATCH] fix testsemver - ---- - src/lib/fcitx-utils/semver.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/lib/fcitx-utils/semver.cpp b/src/lib/fcitx-utils/semver.cpp -index 290a69a..c682dd9 100644 ---- a/src/lib/fcitx-utils/semver.cpp -+++ b/src/lib/fcitx-utils/semver.cpp -@@ -213,6 +213,10 @@ std::optional SemanticVersion::parse(std::string_view data) { - } - } - -+ if (data.empty()) { -+ return version; -+ } -+ - if (data[0] == '+') { - data.remove_prefix(1); - if (auto result = consumeBuild(data)) { --- -2.30.2 - From 050dfc9840086685e029c9be325095a352fa2b3e Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 5 May 2021 12:01:44 +0800 Subject: [PATCH 27/88] Update to 5.0.8 upstream release --- .gitignore | 2 ++ fcitx5.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b2eca5f..8163bf8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ results_*/ /fcitx5-5.0.6_dict.tar.xz.sig /fcitx5-5.0.7_dict.tar.xz /fcitx5-5.0.7_dict.tar.xz.sig +/fcitx5-5.0.8_dict.tar.xz +/fcitx5-5.0.8_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 5694380..e0850d9 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.7 +Version: 5.0.8 Release: 1%{?dist} Summary: Next generation of fcitx License: LGPLv2+ @@ -165,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Wed May 05 2021 Qiyu Yan - 5.0.8-1 +- Update to 5.0.8 upstream release + * Tue Mar 23 2021 Qiyu Yan - 5.0.7-1 - Update to 5.0.7 upstream release diff --git a/sources b/sources index dbd30ef..2eb9a50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.7_dict.tar.xz) = d85eea0a394d04fdba7841d29e2f918e6697a91c4b25bedc9b1b02349f179bcd9048e5c38246073de548e44fc21cc786b6474c51e1eae473579faa6cfdf01840 -SHA512 (fcitx5-5.0.7_dict.tar.xz.sig) = f58f9ed3c73d3b2605a63b05aa79239b3356781e7a069d8f3f5c4d44b7ffa357b90982f58ca18148c21082efab4b7e4c7c5acc2153df8000e90e6ad867c807f4 +SHA512 (fcitx5-5.0.8_dict.tar.xz) = c37d4e44c898c8e352df9495cb380cb5b0837687821274bab88baf39bd17ecc333ea513090437ade8fdfd6f12bc1f91225ca863b1dd814eb8353a6013e43b64d +SHA512 (fcitx5-5.0.8_dict.tar.xz.sig) = 58de1113a8ff3c298d4a2cf9c2bd3ae6e090b83a51c3bacf42f4fd0e747f236b71691931a0450f2a002746f92d39f4b9b9184d901a15bf1e0c5b120b6c86a194 From 15da6ce37a32b49caa1f3ec07058cd76951fbbe2 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 7 May 2021 23:50:35 +0800 Subject: [PATCH 28/88] change environment --- fcitx5.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fcitx5.sh b/fcitx5.sh index 062bff9..f121213 100755 --- a/fcitx5.sh +++ b/fcitx5.sh @@ -1,7 +1,10 @@ if [ ! "$XDG_SESSION_TYPE" = "tty" ] # if this is a gui session (not tty) then - export INPUT_METHOD=fcitx5 - export GTK_IM_MODULE=fcitx5 - export QT_IM_MODULE=fcitx5 - export XMODIFIERS=@im=fcitx5 -fi \ No newline at end of file + # let's use fcitx instead of fcitx5 to make flatpak happy + # this may break behavior for users who have installed both + # fcitx and fcitx5, let then change the file on their own + export INPUT_METHOD=fcitx + export GTK_IM_MODULE=fcitx + export QT_IM_MODULE=fcitx + export XMODIFIERS=@im=fcitx +fi From aff079855eed3f5316b49def74f83f5269a659dd Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 7 May 2021 23:51:51 +0800 Subject: [PATCH 29/88] Bump and rebuild fcitx5-5.0.8-2 --- fcitx5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index e0850d9..0622c13 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -165,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Fri May 07 2021 Qiyu Yan - 5.0.8-2 +- Workaround a flatpak problem + * Wed May 05 2021 Qiyu Yan - 5.0.8-1 - Update to 5.0.8 upstream release From 6dc20563a3e4a296c9ee92dcb20fcbff350a24da Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 1 Jul 2021 20:27:01 +0800 Subject: [PATCH 30/88] Cleanup dependences --- fcitx5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 0622c13..068fe9c 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -45,7 +45,7 @@ BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: /usr/bin/appstream-util -Requires: dbus-x11 +Requires: dbus-common Requires: %{name}-data = %{version}-%{release} Requires: setup Requires(post): %{_sbindir}/alternatives @@ -165,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Thu Jul 01 2021 Qiyu Yan - 5.0.8-3 +- Cleanup dependences + * Fri May 07 2021 Qiyu Yan - 5.0.8-2 - Workaround a flatpak problem From 53d34a5e1983d311074eef4c6519d70fe3ec525a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 10 Jul 2021 11:52:49 +0200 Subject: [PATCH 31/88] Rebuild for versioned symbols in json-c --- fcitx5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index 068fe9c..123eb04 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -165,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Sat Jul 10 2021 Björn Esser - 5.0.8-4 +- Rebuild for versioned symbols in json-c + * Thu Jul 01 2021 Qiyu Yan - 5.0.8-3 - Cleanup dependences From 8e702b0ee3b4a80966584fd6d6ef6fb8a9057103 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:44:10 +0000 Subject: [PATCH 32/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcitx5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index 123eb04..293b76f 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -165,6 +165,9 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 5.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 10 2021 Björn Esser - 5.0.8-4 - Rebuild for versioned symbols in json-c From 6b5b231b7290a0825b01d1399366ba040c5fdad1 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 12 Sep 2021 15:51:03 +0800 Subject: [PATCH 33/88] use rpmautospec --- changelog | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ fcitx5.spec | 93 ++--------------------------------------------------- 2 files changed, 92 insertions(+), 91 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..019ded6 --- /dev/null +++ b/changelog @@ -0,0 +1,90 @@ +* Wed Jul 21 2021 Fedora Release Engineering - 5.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 5.0.8-4 +- Rebuild for versioned symbols in json-c + +* Thu Jul 01 2021 Qiyu Yan - 5.0.8-3 +- Cleanup dependences + +* Fri May 07 2021 Qiyu Yan - 5.0.8-2 +- Workaround a flatpak problem + +* Wed May 05 2021 Qiyu Yan - 5.0.8-1 +- Update to 5.0.8 upstream release + +* Tue Mar 23 2021 Qiyu Yan - 5.0.7-1 +- Update to 5.0.7 upstream release + +* Mon Mar 22 2021 Qiyu Yan - 5.0.6-1 +- Update to 5.0.6 upstream release + +* Sat Feb 20 2021 Qiyu Yan - 5.0.5-1 +- update to 5.0.5 upstream release + +* Tue Jan 26 2021 Fedora Release Engineering - 5.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 12:19:25 CST 2021 Qiyu Yan - 5.0.4-2 +- use conditional suggests + +* Tue Jan 12 21:48:18 CST 2021 yan - 5.0.4-1 +- update to 5.0.4 upstream release + +* Fri Dec 11 16:49:42 CST 2020 Qiyu Yan - 5.0.3-3 +- fix conlict with fcitx4 + +* Wed Dec 9 00:25:45 CST 2020 Qiyu Yan - 5.0.3-2 +- explicit Conflicts against fcitx-data + +* Mon Dec 7 10:40:52 CST 2020 Qiyu Yan - 5.0.3-1 +- Update to 5.0.3 upstream release + +* Sat Dec 5 15:14:08 CST 2020 Qiyu Yan - 5.0.2-2 +- add weak dep to im-modules + +* Sat Dec 5 13:30:48 CST 2020 Qiyu Yan - 5.0.2-1 +- Update to 5.0.2 upstream release + +* Tue Nov 3 21:20:30 CST 2020 Qiyu Yan - 5.0.1-2 +- add fcitx5-autostart package to auto setup env and autostart + +* Tue Nov 3 18:00:49 CST 2020 Qiyu Yan - 5.0.1-1 +- update to 5.0.1 upstream release + +* Sat Oct 31 22:01:00 CST 2020 Qiyu Yan - 0-0.10 +- update to a5a0551a22971738283fc4812d2afe77efb626e3 upstream commit +- upstream added dbus service + +* Fri Oct 16 2020 Qiyu Yan - 0-0.9.20201016gitdd9dc94 +- update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit + +* Wed Sep 16 2020 Qiyu Yan - 0-0.8 +- upstream commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa + +* Sat Sep 12 2020 Karuboniru - 0-0.7 +- Drop imsetting +- Update to commit d0383bc4a8e65e71189c18e31f7b832e543144c1 +- sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 + +* Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 +- Fix a typo + +* Tue Sep 1 09:07:22 CST 2020 Qiyu Yan - 0-0.5.20200830git4706f37 +- Own /usr/share/fcitx5/inputmethod + +* Sun Aug 30 23:39:20 CST 2020 Qiyu Yan - 0-0.4.20200830git4706f37 +- rebuild to push to f32 + +* Sun Aug 30 2020 Qiyu Yan - 0-0.3.20200830git4706f37 +- update to commit 4706f37e60686d391a7f9a45ca1be6df6052ec4d +- fix a wrong xinputrc file + +* Sun Aug 16 2020 Qiyu Yan - 0-0.2.20200813git87fb655 +- change according to review suggestions + +* Thu Aug 13 2020 Qiyu Yan - 0-0.1.20200813git87fb655 +- new version + +* Wed Aug 12 2020 Qiyu Yan - 0-0.1.20200811gitc87ea48 +- initial package diff --git a/fcitx5.spec b/fcitx5.spec index 293b76f..ed98b63 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -3,7 +3,7 @@ Name: fcitx5 Version: 5.0.8 -Release: 5%{?dist} +Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 @@ -165,93 +165,4 @@ fi %config %{_sysconfdir}/profile.d/fcitx5.sh %changelog -* Wed Jul 21 2021 Fedora Release Engineering - 5.0.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 5.0.8-4 -- Rebuild for versioned symbols in json-c - -* Thu Jul 01 2021 Qiyu Yan - 5.0.8-3 -- Cleanup dependences - -* Fri May 07 2021 Qiyu Yan - 5.0.8-2 -- Workaround a flatpak problem - -* Wed May 05 2021 Qiyu Yan - 5.0.8-1 -- Update to 5.0.8 upstream release - -* Tue Mar 23 2021 Qiyu Yan - 5.0.7-1 -- Update to 5.0.7 upstream release - -* Mon Mar 22 2021 Qiyu Yan - 5.0.6-1 -- Update to 5.0.6 upstream release - -* Sat Feb 20 2021 Qiyu Yan - 5.0.5-1 -- update to 5.0.5 upstream release - -* Tue Jan 26 2021 Fedora Release Engineering - 5.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 12:19:25 CST 2021 Qiyu Yan - 5.0.4-2 -- use conditional suggests - -* Tue Jan 12 21:48:18 CST 2021 yan - 5.0.4-1 -- update to 5.0.4 upstream release - -* Fri Dec 11 16:49:42 CST 2020 Qiyu Yan - 5.0.3-3 -- fix conlict with fcitx4 - -* Wed Dec 9 00:25:45 CST 2020 Qiyu Yan - 5.0.3-2 -- explicit Conflicts against fcitx-data - -* Mon Dec 7 10:40:52 CST 2020 Qiyu Yan - 5.0.3-1 -- Update to 5.0.3 upstream release - -* Sat Dec 5 15:14:08 CST 2020 Qiyu Yan - 5.0.2-2 -- add weak dep to im-modules - -* Sat Dec 5 13:30:48 CST 2020 Qiyu Yan - 5.0.2-1 -- Update to 5.0.2 upstream release - -* Tue Nov 3 21:20:30 CST 2020 Qiyu Yan - 5.0.1-2 -- add fcitx5-autostart package to auto setup env and autostart - -* Tue Nov 3 18:00:49 CST 2020 Qiyu Yan - 5.0.1-1 -- update to 5.0.1 upstream release - -* Sat Oct 31 22:01:00 CST 2020 Qiyu Yan - 0-0.10 -- update to a5a0551a22971738283fc4812d2afe77efb626e3 upstream commit -- upstream added dbus service - -* Fri Oct 16 2020 Qiyu Yan - 0-0.9.20201016gitdd9dc94 -- update to dd9dc94c42ee98ea04782bdb4d4aa3f7822e56f0 upstream commit - -* Wed Sep 16 2020 Qiyu Yan - 0-0.8 -- upstream commit 5415db391c1b84ea9964b0d508c053ae5c25e4aa - -* Sat Sep 12 2020 Karuboniru - 0-0.7 -- Drop imsetting -- Update to commit d0383bc4a8e65e71189c18e31f7b832e543144c1 -- sobump from libFcitx5Core.so.6 to libFcitx5Core.so.7 - -* Wed Sep 2 08:44:37 CST 2020 Qiyu Yan - 0-0.6 -- Fix a typo - -* Tue Sep 1 09:07:22 CST 2020 Qiyu Yan - 0-0.5.20200830git4706f37 -- Own /usr/share/fcitx5/inputmethod - -* Sun Aug 30 23:39:20 CST 2020 Qiyu Yan - 0-0.4.20200830git4706f37 -- rebuild to push to f32 - -* Sun Aug 30 2020 Qiyu Yan - 0-0.3.20200830git4706f37 -- update to commit 4706f37e60686d391a7f9a45ca1be6df6052ec4d -- fix a wrong xinputrc file - -* Sun Aug 16 2020 Qiyu Yan - 0-0.2.20200813git87fb655 -- change according to review suggestions - -* Thu Aug 13 2020 Qiyu Yan - 0-0.1.20200813git87fb655 -- new version - -* Wed Aug 12 2020 Qiyu Yan - 0-0.1.20200811gitc87ea48 -- initial package +%autochangelog From d06cc17b96a14acc50bd5e04a41c93294659ac49 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 26 Sep 2021 16:57:04 +0800 Subject: [PATCH 34/88] update to 5.0.9 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8163bf8..c37ad7c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ results_*/ /fcitx5-5.0.7_dict.tar.xz.sig /fcitx5-5.0.8_dict.tar.xz /fcitx5-5.0.8_dict.tar.xz.sig +/fcitx5-5.0.9_dict.tar.xz +/fcitx5-5.0.9_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index ed98b63..3de5723 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.8 +Version: 5.0.9 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 2eb9a50..be176a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.8_dict.tar.xz) = c37d4e44c898c8e352df9495cb380cb5b0837687821274bab88baf39bd17ecc333ea513090437ade8fdfd6f12bc1f91225ca863b1dd814eb8353a6013e43b64d -SHA512 (fcitx5-5.0.8_dict.tar.xz.sig) = 58de1113a8ff3c298d4a2cf9c2bd3ae6e090b83a51c3bacf42f4fd0e747f236b71691931a0450f2a002746f92d39f4b9b9184d901a15bf1e0c5b120b6c86a194 +SHA512 (fcitx5-5.0.9_dict.tar.xz) = f5f3d41038b16a0cbf55ac1de2b10653d036d74a17efb228dfd12214a533d78f0cc586af62ac5331f593fbeaee019d6d15bd432a26564781ec3c51c27d0f7815 +SHA512 (fcitx5-5.0.9_dict.tar.xz.sig) = 247b5ed4170c6e7bd5711ce2e9691145438c91685371f8da7f417e70c159719ce0695b0bfd99129dc93aca4a24d63e0fd27695741ae810ec613f542bdd89982d From 4cfaa174a7e8db2663ea4c6f943ff9773155bb1e Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 6 Nov 2021 13:16:20 +0800 Subject: [PATCH 35/88] update to 5.0.10 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c37ad7c..c626de3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ results_*/ /fcitx5-5.0.8_dict.tar.xz.sig /fcitx5-5.0.9_dict.tar.xz /fcitx5-5.0.9_dict.tar.xz.sig +/fcitx5-5.0.10_dict.tar.xz +/fcitx5-5.0.10_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 3de5723..fafe41f 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.9 +Version: 5.0.10 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index be176a6..4979327 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.9_dict.tar.xz) = f5f3d41038b16a0cbf55ac1de2b10653d036d74a17efb228dfd12214a533d78f0cc586af62ac5331f593fbeaee019d6d15bd432a26564781ec3c51c27d0f7815 -SHA512 (fcitx5-5.0.9_dict.tar.xz.sig) = 247b5ed4170c6e7bd5711ce2e9691145438c91685371f8da7f417e70c159719ce0695b0bfd99129dc93aca4a24d63e0fd27695741ae810ec613f542bdd89982d +SHA512 (fcitx5-5.0.10_dict.tar.xz) = 1920b11c74e4a24f4eaa9ba163d509a7933c3fa4afc4bd891c038733ff79cbc3a281a80167f92ae546055479ce443e61765713d32a04ea4bc491e8312582fbe6 +SHA512 (fcitx5-5.0.10_dict.tar.xz.sig) = 2ce95ca3a1027771bb487e1bd01d6f257350eb6ca0dded0ade3b3e4756b10c7bfaa6e53df28962fc902e41a5c4de637e7107ffa420898e24d55f0912811d3639 From 6939ad1eb0783555b611ccd513034315dfe9f9cc Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 5 Dec 2021 11:28:47 +0800 Subject: [PATCH 36/88] update to 5.0.11 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c626de3..e2499ae 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ results_*/ /fcitx5-5.0.9_dict.tar.xz.sig /fcitx5-5.0.10_dict.tar.xz /fcitx5-5.0.10_dict.tar.xz.sig +/fcitx5-5.0.11_dict.tar.xz +/fcitx5-5.0.11_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index fafe41f..c60c3e8 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.10 +Version: 5.0.11 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 4979327..d10e6e4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.10_dict.tar.xz) = 1920b11c74e4a24f4eaa9ba163d509a7933c3fa4afc4bd891c038733ff79cbc3a281a80167f92ae546055479ce443e61765713d32a04ea4bc491e8312582fbe6 -SHA512 (fcitx5-5.0.10_dict.tar.xz.sig) = 2ce95ca3a1027771bb487e1bd01d6f257350eb6ca0dded0ade3b3e4756b10c7bfaa6e53df28962fc902e41a5c4de637e7107ffa420898e24d55f0912811d3639 +SHA512 (fcitx5-5.0.11_dict.tar.xz) = dd3aaeb2737d9ba975800485eadbb7d2ac386ca5d001f32504a3b445e5d6acf79914abb9da56e4382d095e28197634105c52a7972aaeab8edcba9d48ef62fb08 +SHA512 (fcitx5-5.0.11_dict.tar.xz.sig) = a782490fdf199aabb9a48b9f7007a6e6ba750f31ff280b87b5a475f67cd1421e22ac33f015b32701845f97085dd71a264f6a09b9c22b3a5f9ff47f821d8d16b1 From 30fe313faaffaca714584d2dfad4d3926378481b Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 2 Jan 2022 10:36:26 +0800 Subject: [PATCH 37/88] update to 5.0.12 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e2499ae..7db8c25 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ results_*/ /fcitx5-5.0.10_dict.tar.xz.sig /fcitx5-5.0.11_dict.tar.xz /fcitx5-5.0.11_dict.tar.xz.sig +/fcitx5-5.0.12_dict.tar.xz +/fcitx5-5.0.12_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index c60c3e8..ee33c4f 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.11 +Version: 5.0.12 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d10e6e4..805acba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.11_dict.tar.xz) = dd3aaeb2737d9ba975800485eadbb7d2ac386ca5d001f32504a3b445e5d6acf79914abb9da56e4382d095e28197634105c52a7972aaeab8edcba9d48ef62fb08 -SHA512 (fcitx5-5.0.11_dict.tar.xz.sig) = a782490fdf199aabb9a48b9f7007a6e6ba750f31ff280b87b5a475f67cd1421e22ac33f015b32701845f97085dd71a264f6a09b9c22b3a5f9ff47f821d8d16b1 +SHA512 (fcitx5-5.0.12_dict.tar.xz) = de140d64346717f3bd525cfb4472c71f117a851322e0d277ebcf69d731e7b3297a1c5bfdf0541747dab7d0c25c56c4bb6e3ee6467f7b9de9046332757f414b74 +SHA512 (fcitx5-5.0.12_dict.tar.xz.sig) = 6bc6396bf3e98006f4103ca20e16cea6a5f74cb8e83d46a47fa3cf5de45f6d192c6e12a854ad66e4b276115becd7f15f700258dad1b60250f53b5c75255802d0 From 2fae54ad35f5915b8d0bcd109c64dab97a65e33a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 11 Jan 2022 09:56:19 +0800 Subject: [PATCH 38/88] update to 5.0.13 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7db8c25..b6af148 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ results_*/ /fcitx5-5.0.11_dict.tar.xz.sig /fcitx5-5.0.12_dict.tar.xz /fcitx5-5.0.12_dict.tar.xz.sig +/fcitx5-5.0.13_dict.tar.xz +/fcitx5-5.0.13_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index ee33c4f..acbc69c 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.12 +Version: 5.0.13 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 805acba..dd158ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.12_dict.tar.xz) = de140d64346717f3bd525cfb4472c71f117a851322e0d277ebcf69d731e7b3297a1c5bfdf0541747dab7d0c25c56c4bb6e3ee6467f7b9de9046332757f414b74 -SHA512 (fcitx5-5.0.12_dict.tar.xz.sig) = 6bc6396bf3e98006f4103ca20e16cea6a5f74cb8e83d46a47fa3cf5de45f6d192c6e12a854ad66e4b276115becd7f15f700258dad1b60250f53b5c75255802d0 +SHA512 (fcitx5-5.0.13_dict.tar.xz) = 1f4d541a4f4b742040b1155208f15b78d19fa78ea7fc8cec586705f3682f2713f0322ed0d8b8d1b2d07ac37afcc5f4e4e9b8327b10532f789f0452c5b760fe1d +SHA512 (fcitx5-5.0.13_dict.tar.xz.sig) = 8c5721586110a9be01b8b2533825c8d91764caab56c77f89afd005456d8fcdf6a345f11b831de39d362dca730e2083ce0f8910a87ce669046db8cc26297e62a8 From 4690bacac9326b58425c70cdbf1a6854e4812bed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:46:20 +0000 Subject: [PATCH 39/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d9880e0e00eb568ebb0ba7b7c895f36a8df1ae3e Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 2 Feb 2022 13:53:47 +0800 Subject: [PATCH 40/88] update to upstream release 5.0.14 --- fcitx5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index acbc69c..2fc2326 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.13 +Version: 5.0.14 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ From 8f39080f71d7ddd7a2cc1256536e02dd41044eec Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 2 Feb 2022 13:54:59 +0800 Subject: [PATCH 41/88] update sources --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b6af148..25feb9e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ results_*/ /fcitx5-5.0.12_dict.tar.xz.sig /fcitx5-5.0.13_dict.tar.xz /fcitx5-5.0.13_dict.tar.xz.sig +/fcitx5-5.0.14_dict.tar.xz +/fcitx5-5.0.14_dict.tar.xz.sig diff --git a/sources b/sources index dd158ee..31f499d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.13_dict.tar.xz) = 1f4d541a4f4b742040b1155208f15b78d19fa78ea7fc8cec586705f3682f2713f0322ed0d8b8d1b2d07ac37afcc5f4e4e9b8327b10532f789f0452c5b760fe1d -SHA512 (fcitx5-5.0.13_dict.tar.xz.sig) = 8c5721586110a9be01b8b2533825c8d91764caab56c77f89afd005456d8fcdf6a345f11b831de39d362dca730e2083ce0f8910a87ce669046db8cc26297e62a8 +SHA512 (fcitx5-5.0.14_dict.tar.xz) = d2ff5abe44f107f5d3abd6355774deab8a27b3c8358bf009510413898aa809a7b2705a0b94e020a07ca56a247a8b626fd3c02472722079c2f62d9a2a57adc6e4 +SHA512 (fcitx5-5.0.14_dict.tar.xz.sig) = c95654e182f97f21568455191b42c6c095019325320f6a7cf9b6be7fcf3dfad5bdfb3ad42d59710fbd4ea8e3bdcd5cbaa25eb9e43a05d4707bd42267f873d3c1 From fded888b66d8a9a336d9362e71441c832c3b2af1 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 2 Feb 2022 14:12:27 +0800 Subject: [PATCH 42/88] Add fcitx5-wayland-launcher --- fcitx5.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fcitx5.spec b/fcitx5.spec index 2fc2326..df5e6e0 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -144,6 +144,7 @@ fi %{_libdir}/libFcitx5Config.so.6 %{_libdir}/libFcitx5Core.so.7 %{_libdir}/libFcitx5Utils.so.2 +%{_libexecdir}/fcitx5-wayland-launcher %files devel %{_includedir}/Fcitx5/ From 0c2ceab8774c7a4a088a1267e0927b0556822969 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 2 Feb 2022 14:18:05 +0800 Subject: [PATCH 43/88] use Suggests instead to workaround an updating issue --- fcitx5.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index df5e6e0..98dec05 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -51,9 +51,9 @@ Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives -Requires: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) -Requires: (fcitx5-qt if qt5-qtbase) -Requires: (fcitx5-qt-module if qt5-qtbase) +Suggests: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) +Suggests: (fcitx5-qt if qt5-qtbase) +Suggests: (fcitx5-qt-module if qt5-qtbase) %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. From 2d2c6eb1d0ff8d07d9e13654e7c705776393a08a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 16 Feb 2022 10:56:47 +0800 Subject: [PATCH 44/88] fix weak deps --- fcitx5.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 98dec05..987f684 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -51,9 +51,9 @@ Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives -Suggests: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) -Suggests: (fcitx5-qt if qt5-qtbase) -Suggests: (fcitx5-qt-module if qt5-qtbase) +Recommends: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) +Recommends: (fcitx5-qt if (qt5-qtbase or qt6-qtbase)) +Recommends: (fcitx5-qt-module if (qt5-qtbase or qt6-qtbase)) %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. From 07004785af22799464155a69e29393f51ca86c65 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 10 Mar 2022 13:58:48 +0800 Subject: [PATCH 45/88] update to upstream release 5.0.15 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 25feb9e..55c1714 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ results_*/ /fcitx5-5.0.13_dict.tar.xz.sig /fcitx5-5.0.14_dict.tar.xz /fcitx5-5.0.14_dict.tar.xz.sig +/fcitx5-5.0.15_dict.tar.xz +/fcitx5-5.0.15_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 987f684..d78ded5 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.14 +Version: 5.0.15 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 31f499d..3bbabde 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.14_dict.tar.xz) = d2ff5abe44f107f5d3abd6355774deab8a27b3c8358bf009510413898aa809a7b2705a0b94e020a07ca56a247a8b626fd3c02472722079c2f62d9a2a57adc6e4 -SHA512 (fcitx5-5.0.14_dict.tar.xz.sig) = c95654e182f97f21568455191b42c6c095019325320f6a7cf9b6be7fcf3dfad5bdfb3ad42d59710fbd4ea8e3bdcd5cbaa25eb9e43a05d4707bd42267f873d3c1 +SHA512 (fcitx5-5.0.15_dict.tar.xz) = 94ba90226a859d7e63fc682c3cfed52eb3726f57c0b7e8c42b3acc6a39586403a3bb3c3bf53b9330d430b07032c88381bce08c02e7372709bfecc27d42f62254 +SHA512 (fcitx5-5.0.15_dict.tar.xz.sig) = eab645a927de6f564defd2be8fdd355772816408f8311d105c2624da5038846437ec5da6149470aa1b01f28fe42be0b42d3c0e2412ed34e5fb2ef59a9b1e9c78 From 255072e4ca536a6396f0aaa58f8c7e7e3f6289cd Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 26 Mar 2022 12:36:04 +0800 Subject: [PATCH 46/88] fix env for xim --- fcitx5-xinput | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcitx5-xinput b/fcitx5-xinput index 18456e9..3a00a38 100644 --- a/fcitx5-xinput +++ b/fcitx5-xinput @@ -4,13 +4,13 @@ ICON="fcitx5" XIM_ARGS="-D" PREFERENCE_PROGRAM=/usr/bin/fcitx5-configtool SHORT_DESC="fcitx5" -GTK_IM_MODULE=fcitx5 +GTK_IM_MODULE=fcitx if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx5.so || \ test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx5.so || \ test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so; then - QT_IM_MODULE=fcitx5 + QT_IM_MODULE=fcitx else QT_IM_MODULE=xim fi From e9722f3b288c053b91b26ee466708bd6831e1844 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 23 May 2022 22:18:38 +0800 Subject: [PATCH 47/88] update to upstream release 5.0.16 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 55c1714..8aee0c9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ results_*/ /fcitx5-5.0.14_dict.tar.xz.sig /fcitx5-5.0.15_dict.tar.xz /fcitx5-5.0.15_dict.tar.xz.sig +/fcitx5-5.0.16_dict.tar.xz +/fcitx5-5.0.16_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index d78ded5..1a9b316 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.15 +Version: 5.0.16 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 3bbabde..24f141e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.15_dict.tar.xz) = 94ba90226a859d7e63fc682c3cfed52eb3726f57c0b7e8c42b3acc6a39586403a3bb3c3bf53b9330d430b07032c88381bce08c02e7372709bfecc27d42f62254 -SHA512 (fcitx5-5.0.15_dict.tar.xz.sig) = eab645a927de6f564defd2be8fdd355772816408f8311d105c2624da5038846437ec5da6149470aa1b01f28fe42be0b42d3c0e2412ed34e5fb2ef59a9b1e9c78 +SHA512 (fcitx5-5.0.16_dict.tar.xz) = fd237c04fb085b3997aabb96b23db27948af68367f57ad2a89a56a7f46410bcd87f0c22e58e4cc9d9de170360ff7b2e533f375d2378d1673e10fed8fc295b0fa +SHA512 (fcitx5-5.0.16_dict.tar.xz.sig) = 855a05fff97c03e4da378ccbe2b8c185443453cd07d42ea215450b5b91f4c539b44fed273e6e5bb51be0cef8d3ca812d229d93a5b3991e2b9ebbae13b695ab01 From eabb2a4d6df457d74ba665b473b04e9c0a47608a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 2 Jun 2022 10:20:44 +0800 Subject: [PATCH 48/88] update to upstream release 5.0.17 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8aee0c9..3267658 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ results_*/ /fcitx5-5.0.15_dict.tar.xz.sig /fcitx5-5.0.16_dict.tar.xz /fcitx5-5.0.16_dict.tar.xz.sig +/fcitx5-5.0.17_dict.tar.xz +/fcitx5-5.0.17_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 1a9b316..903dbd7 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.16 +Version: 5.0.17 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 24f141e..392e643 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.16_dict.tar.xz) = fd237c04fb085b3997aabb96b23db27948af68367f57ad2a89a56a7f46410bcd87f0c22e58e4cc9d9de170360ff7b2e533f375d2378d1673e10fed8fc295b0fa -SHA512 (fcitx5-5.0.16_dict.tar.xz.sig) = 855a05fff97c03e4da378ccbe2b8c185443453cd07d42ea215450b5b91f4c539b44fed273e6e5bb51be0cef8d3ca812d229d93a5b3991e2b9ebbae13b695ab01 +SHA512 (fcitx5-5.0.17_dict.tar.xz) = fe2d45ffacef93aa6c7747a30d99923e6ce5fb8c54c9093fc1b3a87606eb4b9a789951110ac33371b191ccdd9e43a2063ab2665946c0c0f447e2c574f784491f +SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 3657ca644fcb7ae81d7bf588f74dbdb74f27580c318a83bcd9c2f33bfa319baf7cb2c44cf4310a288ee9e35a68bc31db0eabdbbe59dbfb9c86fc8fd38d726482 From 768fc509e8867352bd25c0a79fa2c96796ec6a0a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 10 Jun 2022 11:41:33 +0800 Subject: [PATCH 49/88] Update using upstream's new 5.0.17 tarball --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 392e643..19dfe88 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.17_dict.tar.xz) = fe2d45ffacef93aa6c7747a30d99923e6ce5fb8c54c9093fc1b3a87606eb4b9a789951110ac33371b191ccdd9e43a2063ab2665946c0c0f447e2c574f784491f -SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 3657ca644fcb7ae81d7bf588f74dbdb74f27580c318a83bcd9c2f33bfa319baf7cb2c44cf4310a288ee9e35a68bc31db0eabdbbe59dbfb9c86fc8fd38d726482 +SHA512 (fcitx5-5.0.17_dict.tar.xz) = 23c112e35c633cd60050f62a169bc51587c95911f28ae08a5446de8569393341020b470e3cadc692c62228bec2f047e0abd6461a30ddadd2ad5fdb0b9176b616 +SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 64f21236f16636d3dd9e6b77d859e179a1560906515e5201539afa0e9a6715bf950d6156ff63de43d7add7c7c59e7ed2c1243cbc3c03f041444b5aee05208940 From b2310946443c1f319ade351fb3b0f736c1f887ab Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 4 Jul 2022 13:03:25 +0800 Subject: [PATCH 50/88] update to upstream release 5.0.18 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3267658..6c32942 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ results_*/ /fcitx5-5.0.16_dict.tar.xz.sig /fcitx5-5.0.17_dict.tar.xz /fcitx5-5.0.17_dict.tar.xz.sig +/fcitx5-5.0.18_dict.tar.xz +/fcitx5-5.0.18_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 903dbd7..a2504b0 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.17 +Version: 5.0.18 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 19dfe88..f858c02 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.17_dict.tar.xz) = 23c112e35c633cd60050f62a169bc51587c95911f28ae08a5446de8569393341020b470e3cadc692c62228bec2f047e0abd6461a30ddadd2ad5fdb0b9176b616 -SHA512 (fcitx5-5.0.17_dict.tar.xz.sig) = 64f21236f16636d3dd9e6b77d859e179a1560906515e5201539afa0e9a6715bf950d6156ff63de43d7add7c7c59e7ed2c1243cbc3c03f041444b5aee05208940 +SHA512 (fcitx5-5.0.18_dict.tar.xz) = a03cd2b8c556fe26470869a624061cc33ac7c6f19be0ba7e01b17c3e7866dee07dc7fed95b2376d670193ed67258abfba8914279ad23507b55312fd48a486be0 +SHA512 (fcitx5-5.0.18_dict.tar.xz.sig) = e4f48699de171e6cc91b81ea5476ee058dd3357166f1e58b1b28b077439d8fcdeadd62d7b418b9134091d9e2e75a752f1abef95218b80026261b2eb236d8b990 From 5363eed9d453a5cfae22574df1b5c14707065c48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:53:54 +0000 Subject: [PATCH 51/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f445ec962926738cfcaa29351601b3019c27c67c Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 28 Aug 2022 19:27:47 +0800 Subject: [PATCH 52/88] add weak dep: fcitx5-configtool (#2122011) --- fcitx5.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fcitx5.spec b/fcitx5.spec index a2504b0..248a448 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -54,6 +54,7 @@ Requires(postun): %{_sbindir}/alternatives Recommends: (fcitx5-gtk if (gtk2 or gtk3 or gtk4)) Recommends: (fcitx5-qt if (qt5-qtbase or qt6-qtbase)) Recommends: (fcitx5-qt-module if (qt5-qtbase or qt6-qtbase)) +Recommends: fcitx5-configtool %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. From ddac5ae4e1318ebc397bedbc56a55a8e3f98416a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 30 Aug 2022 22:18:19 +0800 Subject: [PATCH 53/88] update to upstream release 5.0.19 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6c32942..62ef824 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ results_*/ /fcitx5-5.0.17_dict.tar.xz.sig /fcitx5-5.0.18_dict.tar.xz /fcitx5-5.0.18_dict.tar.xz.sig +/fcitx5-5.0.19_dict.tar.xz +/fcitx5-5.0.19_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 248a448..8c7011e 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.18 +Version: 5.0.19 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index f858c02..7f89b17 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.18_dict.tar.xz) = a03cd2b8c556fe26470869a624061cc33ac7c6f19be0ba7e01b17c3e7866dee07dc7fed95b2376d670193ed67258abfba8914279ad23507b55312fd48a486be0 -SHA512 (fcitx5-5.0.18_dict.tar.xz.sig) = e4f48699de171e6cc91b81ea5476ee058dd3357166f1e58b1b28b077439d8fcdeadd62d7b418b9134091d9e2e75a752f1abef95218b80026261b2eb236d8b990 +SHA512 (fcitx5-5.0.19_dict.tar.xz) = 5bb6386a145b58348503040687ec5589a81e86ae1d5e7aa58edee35972b8bf4d42eecce5344e0a195105914c6c508c97a85d9388b2c4bee4d7d641d3e5792435 +SHA512 (fcitx5-5.0.19_dict.tar.xz.sig) = 99e33aef5c08bb8634ecb73f67bb38d99ecb5ed84902559d0e119f8bb3fc0fe1862f509dd84185fcd096bbf03164e6b60195536b355eec78156e02f09d56ab47 From 70efea538dcaa541631552a8c79dec725c7f4a8a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 21 Nov 2022 11:57:24 +0800 Subject: [PATCH 54/88] update to upstream release 5.0.20 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62ef824..5a8495c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ results_*/ /fcitx5-5.0.18_dict.tar.xz.sig /fcitx5-5.0.19_dict.tar.xz /fcitx5-5.0.19_dict.tar.xz.sig +/fcitx5-5.0.20_dict.tar.xz +/fcitx5-5.0.20_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 8c7011e..7ff4652 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.19 +Version: 5.0.20 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 7f89b17..d490ffa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.19_dict.tar.xz) = 5bb6386a145b58348503040687ec5589a81e86ae1d5e7aa58edee35972b8bf4d42eecce5344e0a195105914c6c508c97a85d9388b2c4bee4d7d641d3e5792435 -SHA512 (fcitx5-5.0.19_dict.tar.xz.sig) = 99e33aef5c08bb8634ecb73f67bb38d99ecb5ed84902559d0e119f8bb3fc0fe1862f509dd84185fcd096bbf03164e6b60195536b355eec78156e02f09d56ab47 +SHA512 (fcitx5-5.0.20_dict.tar.xz) = c0fd8f05e8501f46fc133deefc23ecf81a34f1acc28ae7bb9fbd2b947b02a0cb0d91748650793026ec685a83a862d514b0b89e4418bc097b962bae0aea1de551 +SHA512 (fcitx5-5.0.20_dict.tar.xz.sig) = 70c276036cbd3b279fbd1fd15640ae1b67b854d851c71ccb07527914065796ce9db79aaa349221d5a973b0946f7b926bff7ee5af5e4a051bf18e9046f32750a1 From 9ea58df1d8f6c7a32a07b1d5fda0c04dafaa3369 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 25 Nov 2022 18:26:36 +0800 Subject: [PATCH 55/88] update to upstream release 5.0.21 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5a8495c..c179afd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ results_*/ /fcitx5-5.0.19_dict.tar.xz.sig /fcitx5-5.0.20_dict.tar.xz /fcitx5-5.0.20_dict.tar.xz.sig +/fcitx5-5.0.21_dict.tar.xz +/fcitx5-5.0.21_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 7ff4652..66c7241 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.20 +Version: 5.0.21 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d490ffa..253675d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.20_dict.tar.xz) = c0fd8f05e8501f46fc133deefc23ecf81a34f1acc28ae7bb9fbd2b947b02a0cb0d91748650793026ec685a83a862d514b0b89e4418bc097b962bae0aea1de551 -SHA512 (fcitx5-5.0.20_dict.tar.xz.sig) = 70c276036cbd3b279fbd1fd15640ae1b67b854d851c71ccb07527914065796ce9db79aaa349221d5a973b0946f7b926bff7ee5af5e4a051bf18e9046f32750a1 +SHA512 (fcitx5-5.0.21_dict.tar.xz) = d5396295c11d9b518ac9ea88e680854114a9f84e0a8b82fe49ca91994434646c3f8ab4154d98c6efe0b83cb37f450d63ea49ea74ecc04ea391746340887c3c97 +SHA512 (fcitx5-5.0.21_dict.tar.xz.sig) = 88910c78b22143980e5e5049a4609f8c9db91f0427ddbc93cdcaf9a8bedd80910cd95783c6e29fcc0af6ea14414211b717127b20b6eb5910540dc86f4c848bc3 From cfb09cd4b946b8fd201f7881b111f6edc35a1fe0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:10:35 +0000 Subject: [PATCH 56/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 517288d73aab8f7da7ad4ca32c3b3fd623d0a151 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 12 Mar 2023 10:58:13 +0800 Subject: [PATCH 57/88] update to upstream release 5.0.22 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c179afd..d9aa540 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ results_*/ /fcitx5-5.0.20_dict.tar.xz.sig /fcitx5-5.0.21_dict.tar.xz /fcitx5-5.0.21_dict.tar.xz.sig +/fcitx5-5.0.22_dict.tar.xz +/fcitx5-5.0.22_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 66c7241..d584621 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.21 +Version: 5.0.22 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 253675d..d5c42fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.21_dict.tar.xz) = d5396295c11d9b518ac9ea88e680854114a9f84e0a8b82fe49ca91994434646c3f8ab4154d98c6efe0b83cb37f450d63ea49ea74ecc04ea391746340887c3c97 -SHA512 (fcitx5-5.0.21_dict.tar.xz.sig) = 88910c78b22143980e5e5049a4609f8c9db91f0427ddbc93cdcaf9a8bedd80910cd95783c6e29fcc0af6ea14414211b717127b20b6eb5910540dc86f4c848bc3 +SHA512 (fcitx5-5.0.22_dict.tar.xz) = 3574172fbe854b7f88c3c7a82ee92f47fa842725f056ca158665556403007d4bd9c80a2bd27a4df2f5026fdb30803a67130960be39dc0c3f85e36209d42157cc +SHA512 (fcitx5-5.0.22_dict.tar.xz.sig) = 1998e1b5da6f3edc45ec788eec8251dd948cee0d7f493dd9f5a9f098d0b5ac92dd1cbd94398a0069c0a5cce9a364d6ca8844c3403ff2311b9a17fd88a0c46841 From ccf3d355ffa93d4361250e289b220eabec99f8b4 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 18 Mar 2023 15:46:32 +0800 Subject: [PATCH 58/88] update to upstream release 5.0.23 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d9aa540..0a42c81 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ results_*/ /fcitx5-5.0.21_dict.tar.xz.sig /fcitx5-5.0.22_dict.tar.xz /fcitx5-5.0.22_dict.tar.xz.sig +/fcitx5-5.0.23_dict.tar.xz +/fcitx5-5.0.23_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index d584621..ccc2818 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.22 +Version: 5.0.23 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d5c42fc..5ae262b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.22_dict.tar.xz) = 3574172fbe854b7f88c3c7a82ee92f47fa842725f056ca158665556403007d4bd9c80a2bd27a4df2f5026fdb30803a67130960be39dc0c3f85e36209d42157cc -SHA512 (fcitx5-5.0.22_dict.tar.xz.sig) = 1998e1b5da6f3edc45ec788eec8251dd948cee0d7f493dd9f5a9f098d0b5ac92dd1cbd94398a0069c0a5cce9a364d6ca8844c3403ff2311b9a17fd88a0c46841 +SHA512 (fcitx5-5.0.23_dict.tar.xz) = 74373328ece36e8cabf2844fc6e28602a0a5494baf188460c353c2bc1ae7d8cf296456c277fb1948cc4a6523307fa44e8b0ab6eb8743ae896fc8d05d47ed5e7c +SHA512 (fcitx5-5.0.23_dict.tar.xz.sig) = 28e58d65a63077e3c9834d7ade6ef71a38700de02978e2db4c4939a3cf6ccbca673061840d6c739dbb205cca171cf203e38d3809bd752571c92c5b9127defb9b From 9a33303823c1ad205c0d95220be0a46f3bb2ad6a Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 11:11:56 +0200 Subject: [PATCH 59/88] Rebuilt due to fmt 10 update. From 58136b4aec528f80ddd47af36b4196b3ef01ea8b Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 12:17:38 +0200 Subject: [PATCH 60/88] Added fmt 10 compatibility upstream patch. [skip changelog] --- fcitx5-fmt10-fixes.patch | 26 ++++++++++++++++++++++++++ fcitx5.spec | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 fcitx5-fmt10-fixes.patch diff --git a/fcitx5-fmt10-fixes.patch b/fcitx5-fmt10-fixes.patch new file mode 100644 index 0000000..0e8a339 --- /dev/null +++ b/fcitx5-fmt10-fixes.patch @@ -0,0 +1,26 @@ +From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001 +From: Weng Xuetian +Date: Sat, 20 May 2023 20:02:24 -0700 +Subject: [PATCH] Fix compatiblity with fmt 10.0 + +Fix #797 +--- + src/modules/dbus/dbusmodule.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp +index a7196676..6bebee30 100644 +--- a/src/modules/dbus/dbusmodule.cpp ++++ b/src/modules/dbus/dbusmodule.cpp +@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable { + ss << fmt::format("{:02x}", static_cast(v)); + } + ss << "] program:" << ic->program() +- << " frontend:" << ic->frontend() +- << " cap:" << fmt::format("{:x}", ic->capabilityFlags()) ++ << " frontend:" << ic->frontend() << " cap:" ++ << fmt::format("{:x}", ++ static_cast(ic->capabilityFlags())) + << " focus:" << ic->hasFocus() << std::endl; + return true; + }); diff --git a/fcitx5.spec b/fcitx5.spec index ccc2818..f16c468 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -14,6 +14,9 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh +# https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b +Patch100: fcitx5-fmt10-fixes.patch + BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 From d926610c8c8249256ba5989474f34d602ff480eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:24:11 +0000 Subject: [PATCH 61/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0782627a93c5aeed921538f188d22a66461b99ba Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 18 Aug 2023 10:02:37 +0100 Subject: [PATCH 62/88] update to upstream release 5.1.0 --- .gitignore | 2 ++ fcitx5-fmt10-fixes.patch | 26 -------------------------- fcitx5.spec | 5 +---- sources | 4 ++-- 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 fcitx5-fmt10-fixes.patch diff --git a/.gitignore b/.gitignore index 0a42c81..287998e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ results_*/ /fcitx5-5.0.22_dict.tar.xz.sig /fcitx5-5.0.23_dict.tar.xz /fcitx5-5.0.23_dict.tar.xz.sig +/fcitx5-5.1.0_dict.tar.xz +/fcitx5-5.1.0_dict.tar.xz.sig diff --git a/fcitx5-fmt10-fixes.patch b/fcitx5-fmt10-fixes.patch deleted file mode 100644 index 0e8a339..0000000 --- a/fcitx5-fmt10-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001 -From: Weng Xuetian -Date: Sat, 20 May 2023 20:02:24 -0700 -Subject: [PATCH] Fix compatiblity with fmt 10.0 - -Fix #797 ---- - src/modules/dbus/dbusmodule.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp -index a7196676..6bebee30 100644 ---- a/src/modules/dbus/dbusmodule.cpp -+++ b/src/modules/dbus/dbusmodule.cpp -@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable { - ss << fmt::format("{:02x}", static_cast(v)); - } - ss << "] program:" << ic->program() -- << " frontend:" << ic->frontend() -- << " cap:" << fmt::format("{:x}", ic->capabilityFlags()) -+ << " frontend:" << ic->frontend() << " cap:" -+ << fmt::format("{:x}", -+ static_cast(ic->capabilityFlags())) - << " focus:" << ic->hasFocus() << std::endl; - return true; - }); diff --git a/fcitx5.spec b/fcitx5.spec index f16c468..dc2e494 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.0.23 +Version: 5.1.0 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ @@ -14,9 +14,6 @@ Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput Source4: fcitx5.sh -# https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b -Patch100: fcitx5-fmt10-fixes.patch - BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gnupg2 diff --git a/sources b/sources index 5ae262b..720405d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.0.23_dict.tar.xz) = 74373328ece36e8cabf2844fc6e28602a0a5494baf188460c353c2bc1ae7d8cf296456c277fb1948cc4a6523307fa44e8b0ab6eb8743ae896fc8d05d47ed5e7c -SHA512 (fcitx5-5.0.23_dict.tar.xz.sig) = 28e58d65a63077e3c9834d7ade6ef71a38700de02978e2db4c4939a3cf6ccbca673061840d6c739dbb205cca171cf203e38d3809bd752571c92c5b9127defb9b +SHA512 (fcitx5-5.1.0_dict.tar.xz) = 11ed97710c0c29ffc0b50d0e2e0f6614ff0f29d259cb19be09fb0bbeb72df288507dd5f7b3f150e1f907a767feae14139d5b34b3b9313bac4908c387a83e33b7 +SHA512 (fcitx5-5.1.0_dict.tar.xz.sig) = a01f3d907271126b33b504866651a7f02636165e019eeab0dd807f56b97cc06892890d18a3472e368577f02fad62e18237be359158517867b2867f5234365649 From d75af4ee2f2e811f996354ac7c219283dbeb3fe3 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 2 Oct 2023 16:39:52 +0100 Subject: [PATCH 63/88] update to upstream release 5.1.1 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 287998e..ccd11a8 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ results_*/ /fcitx5-5.0.23_dict.tar.xz.sig /fcitx5-5.1.0_dict.tar.xz /fcitx5-5.1.0_dict.tar.xz.sig +/fcitx5-5.1.1_dict.tar.xz +/fcitx5-5.1.1_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index dc2e494..c92f69a 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.0 +Version: 5.1.1 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 720405d..6b07ee7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.0_dict.tar.xz) = 11ed97710c0c29ffc0b50d0e2e0f6614ff0f29d259cb19be09fb0bbeb72df288507dd5f7b3f150e1f907a767feae14139d5b34b3b9313bac4908c387a83e33b7 -SHA512 (fcitx5-5.1.0_dict.tar.xz.sig) = a01f3d907271126b33b504866651a7f02636165e019eeab0dd807f56b97cc06892890d18a3472e368577f02fad62e18237be359158517867b2867f5234365649 +SHA512 (fcitx5-5.1.1_dict.tar.xz) = 9112cc2f9fb1ef136ce7cb5d098e96b4cf9959f882231408edc9afa3aaa64b1f3b5e0223ead3f16ce385f46c3ec494c42b6fdaa052104be56816ddacd6be682a +SHA512 (fcitx5-5.1.1_dict.tar.xz.sig) = 05564d90f67f72302fb8f0031b6ff499fe0fc156bded291fde16358c9f35187767c1839726a84966507cd9b4e4a5af260822d8f0dfcea8031d986f686e92e47c From cf2d10a5702d362130d7131c204fb2325e7d3d3e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 9 Oct 2023 20:22:21 -0400 Subject: [PATCH 64/88] Use enchant2 enchant-2 is the first choice in the sources, with the deprecated enchant only as a fallback. --- fcitx5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index c92f69a..2c4e59b 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -24,7 +24,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cldr-emoji-annotation) BuildRequires: pkgconfig(dri) -BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fmt) BuildRequires: pkgconfig(gdk-pixbuf-2.0) From 8c6c225cfba461d09a0b886d7aedb14f02f72ebf Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 20 Oct 2023 15:26:26 -0400 Subject: [PATCH 65/88] Separate libs subpackage This prevents fcitx5-qt, which depends on libFcitx5Utils, from pulling in the main and data packages where not needed, such as flatpak runtimes. --- fcitx5.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fcitx5.spec b/fcitx5.spec index 2c4e59b..5cc03ba 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -47,6 +47,7 @@ BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: /usr/bin/appstream-util Requires: dbus-common Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: setup Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives @@ -59,6 +60,13 @@ Recommends: fcitx5-configtool %description Fcitx 5 is a generic input method framework released under LGPL-2.1+. +%package libs +Summary: Libraries for %{name} + +%description libs +The %{name}-libs package contains runtime shared libraries necessary for +running programs using Fcitx5 libraries. + %package data Summary: Data files of Fcitx5 BuildArch: noarch @@ -72,7 +80,7 @@ The %{name}-data package provides shared data for Fcitx5. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files necessary for @@ -141,11 +149,14 @@ fi %{_bindir}/%{name}-remote %{_bindir}/%{name}-diagnose %{_libdir}/%{name}/ +%{_libexecdir}/fcitx5-wayland-launcher + +%files libs +%license LICENSES/LGPL-2.1-or-later.txt %{_libdir}/libFcitx5*.so.*.* %{_libdir}/libFcitx5Config.so.6 %{_libdir}/libFcitx5Core.so.7 %{_libdir}/libFcitx5Utils.so.2 -%{_libexecdir}/fcitx5-wayland-launcher %files devel %{_includedir}/Fcitx5/ From 0e22d91419318173c07044f76492e30d619a1185 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 2 Nov 2023 14:01:46 +0000 Subject: [PATCH 66/88] update to upstream release 5.1.2 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ccd11a8..728f529 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ results_*/ /fcitx5-5.1.0_dict.tar.xz.sig /fcitx5-5.1.1_dict.tar.xz /fcitx5-5.1.1_dict.tar.xz.sig +/fcitx5-5.1.2_dict.tar.xz +/fcitx5-5.1.2_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 5cc03ba..be7deba 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.1 +Version: 5.1.2 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 6b07ee7..55b2ec7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.1_dict.tar.xz) = 9112cc2f9fb1ef136ce7cb5d098e96b4cf9959f882231408edc9afa3aaa64b1f3b5e0223ead3f16ce385f46c3ec494c42b6fdaa052104be56816ddacd6be682a -SHA512 (fcitx5-5.1.1_dict.tar.xz.sig) = 05564d90f67f72302fb8f0031b6ff499fe0fc156bded291fde16358c9f35187767c1839726a84966507cd9b4e4a5af260822d8f0dfcea8031d986f686e92e47c +SHA512 (fcitx5-5.1.2_dict.tar.xz) = dfe546dbb5a777239b8f221fe7a04638f0272df86f6ec9cfba6a5328e36c2b60890613807e52ef1bda487e3daaba7ac47ed5b81a293d494db0f3f0bab4c231c3 +SHA512 (fcitx5-5.1.2_dict.tar.xz.sig) = 1ba7eca4793b285af9ded742969327032e6db374575e029208c5a3fe03ba7a4cdeb4146f8b169a352eb9d7bf702e5ead0df6e5a927022b08ba3492ea6945aa57 From 62106f33700f98f01516c885ba0c10094ad57954 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 4 Nov 2023 10:35:29 +0000 Subject: [PATCH 67/88] update to upstream release 5.1.3 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 728f529..20d52bb 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ results_*/ /fcitx5-5.1.1_dict.tar.xz.sig /fcitx5-5.1.2_dict.tar.xz /fcitx5-5.1.2_dict.tar.xz.sig +/fcitx5-5.1.3_dict.tar.xz +/fcitx5-5.1.3_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index be7deba..1ec4630 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.2 +Version: 5.1.3 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 55b2ec7..9e789bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.2_dict.tar.xz) = dfe546dbb5a777239b8f221fe7a04638f0272df86f6ec9cfba6a5328e36c2b60890613807e52ef1bda487e3daaba7ac47ed5b81a293d494db0f3f0bab4c231c3 -SHA512 (fcitx5-5.1.2_dict.tar.xz.sig) = 1ba7eca4793b285af9ded742969327032e6db374575e029208c5a3fe03ba7a4cdeb4146f8b169a352eb9d7bf702e5ead0df6e5a927022b08ba3492ea6945aa57 +SHA512 (fcitx5-5.1.3_dict.tar.xz) = 9e46e1846c890f17a4133804280ce17f1fba9cb192a77dff854d65b7ee76f79f6192cdd81d5f35ce422f4b6e96ee23d957912c31ef6ed2aaf521a684e41887cf +SHA512 (fcitx5-5.1.3_dict.tar.xz.sig) = 503359e76e97299784b947097449307f01e5371520b49ff98b0ab0f9c3ea23611ce55a9bc4ec61754802db4a7765efeafe996202cd99e6b2226096a633140ff2 From 439c0aad379e2dbe1e6a3a5db45d5f588adb6266 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 6 Nov 2023 08:15:43 +0000 Subject: [PATCH 68/88] update to upstream release 5.1.4 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 20d52bb..3391765 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ results_*/ /fcitx5-5.1.2_dict.tar.xz.sig /fcitx5-5.1.3_dict.tar.xz /fcitx5-5.1.3_dict.tar.xz.sig +/fcitx5-5.1.4_dict.tar.xz +/fcitx5-5.1.4_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 1ec4630..4c95f47 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.3 +Version: 5.1.4 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 9e789bf..004970f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.3_dict.tar.xz) = 9e46e1846c890f17a4133804280ce17f1fba9cb192a77dff854d65b7ee76f79f6192cdd81d5f35ce422f4b6e96ee23d957912c31ef6ed2aaf521a684e41887cf -SHA512 (fcitx5-5.1.3_dict.tar.xz.sig) = 503359e76e97299784b947097449307f01e5371520b49ff98b0ab0f9c3ea23611ce55a9bc4ec61754802db4a7765efeafe996202cd99e6b2226096a633140ff2 +SHA512 (fcitx5-5.1.4_dict.tar.xz) = ea0e8e7d05ff3212ba68b403e6b165a8bcc91430b57eb018755dd7061c15e5c7dcc37ba2bfa4d00d4f96e08115fae31534b6b6de738730d1d5934e5ee5e504ca +SHA512 (fcitx5-5.1.4_dict.tar.xz.sig) = cd6bd8d00247be3cb23cccd09963d0255f2075a639c9106504b12bbfbcd417864e4545e7ceaf46ed989bfecf739ba0eb9f17abb1191ad88050495bc1c2a47c51 From f1d9a26ce5b510f5208da8cb057c1fcfe86d0065 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 14 Nov 2023 09:59:58 +0000 Subject: [PATCH 69/88] update to upstream release 5.1.5 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3391765..66338db 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ results_*/ /fcitx5-5.1.3_dict.tar.xz.sig /fcitx5-5.1.4_dict.tar.xz /fcitx5-5.1.4_dict.tar.xz.sig +/fcitx5-5.1.5_dict.tar.xz +/fcitx5-5.1.5_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 4c95f47..a34b445 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.4 +Version: 5.1.5 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index 004970f..d11d471 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.4_dict.tar.xz) = ea0e8e7d05ff3212ba68b403e6b165a8bcc91430b57eb018755dd7061c15e5c7dcc37ba2bfa4d00d4f96e08115fae31534b6b6de738730d1d5934e5ee5e504ca -SHA512 (fcitx5-5.1.4_dict.tar.xz.sig) = cd6bd8d00247be3cb23cccd09963d0255f2075a639c9106504b12bbfbcd417864e4545e7ceaf46ed989bfecf739ba0eb9f17abb1191ad88050495bc1c2a47c51 +SHA512 (fcitx5-5.1.5_dict.tar.xz) = d4b5400401b9941cf23dcc5682b026a576bfe57f93a8f65e93127aadedde853c3d026105fac893aaf872a7c8418f3a0d9487e42bcc1427e62c7439f7fb0a3a80 +SHA512 (fcitx5-5.1.5_dict.tar.xz.sig) = 6afc8f0a622764a945f09f98865a57afcfa3356ec35c8daec0dcb9d16d3366add09ca8be7ea85fe17423723fd0bef3ad8c8bee126d76f03f10120b49a8405899 From 60d6fc276bdd56740975315b33f6ffe0d2fa088a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 5 Jan 2024 18:34:32 +0800 Subject: [PATCH 70/88] update to upstream release 5.1.6 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 66338db..d974c2f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ results_*/ /fcitx5-5.1.4_dict.tar.xz.sig /fcitx5-5.1.5_dict.tar.xz /fcitx5-5.1.5_dict.tar.xz.sig +/fcitx5-5.1.6_dict.tar.xz +/fcitx5-5.1.6_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index a34b445..fd25f21 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.5 +Version: 5.1.6 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index d11d471..72e6324 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.5_dict.tar.xz) = d4b5400401b9941cf23dcc5682b026a576bfe57f93a8f65e93127aadedde853c3d026105fac893aaf872a7c8418f3a0d9487e42bcc1427e62c7439f7fb0a3a80 -SHA512 (fcitx5-5.1.5_dict.tar.xz.sig) = 6afc8f0a622764a945f09f98865a57afcfa3356ec35c8daec0dcb9d16d3366add09ca8be7ea85fe17423723fd0bef3ad8c8bee126d76f03f10120b49a8405899 +SHA512 (fcitx5-5.1.6_dict.tar.xz) = 8f10dfb230d4b4c7e559eb77e7a56c17964e404dc12bd3319f7dc715159a289faa1df95a342a0a1723e7d645aba808b967fd10d04ac065de2c49843a7905e7cb +SHA512 (fcitx5-5.1.6_dict.tar.xz.sig) = 87ce2c919768fc94f3723b0accd789a9d2a1094382bc936efc72c88c331320d3e4c5353bdef8efb8bef9756cf73fa6cb53548ec2b336a44af088b58d55c77c84 From ed5fe5f9f67e2ab89cea81a8822fda0452bda178 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 17 Jan 2024 14:35:26 +0000 Subject: [PATCH 71/88] update to upstream release 5.1.7 --- .gitignore | 2 ++ fcitx5.spec | 8 +++++++- sources | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d974c2f..5996120 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ results_*/ /fcitx5-5.1.5_dict.tar.xz.sig /fcitx5-5.1.6_dict.tar.xz /fcitx5-5.1.6_dict.tar.xz.sig +/fcitx5-5.1.7_dict.tar.xz +/fcitx5-5.1.7_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index fd25f21..1dff458 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.6 +Version: 5.1.7 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ @@ -115,6 +115,10 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}-wayland-launcher.desktop # convert symlinked icons to copied icons, this will help co-existing with # fcitx4 @@ -150,6 +154,7 @@ fi %{_bindir}/%{name}-diagnose %{_libdir}/%{name}/ %{_libexecdir}/fcitx5-wayland-launcher +%{_sysconfdir}/xdg/Xwayland-session.d/20-fcitx-x11 %files libs %license LICENSES/LGPL-2.1-or-later.txt @@ -171,6 +176,7 @@ fi %{_datadir}/applications/org.fcitx.Fcitx5.desktop %{_metainfodir}/org.fcitx.Fcitx5.metainfo.xml %{_datadir}/applications/%{name}-configtool.desktop +%{_datadir}/applications/%{name}-wayland-launcher.desktop %{_datadir}/icons/hicolor/*/apps/* %files autostart diff --git a/sources b/sources index 72e6324..f7901f5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.6_dict.tar.xz) = 8f10dfb230d4b4c7e559eb77e7a56c17964e404dc12bd3319f7dc715159a289faa1df95a342a0a1723e7d645aba808b967fd10d04ac065de2c49843a7905e7cb -SHA512 (fcitx5-5.1.6_dict.tar.xz.sig) = 87ce2c919768fc94f3723b0accd789a9d2a1094382bc936efc72c88c331320d3e4c5353bdef8efb8bef9756cf73fa6cb53548ec2b336a44af088b58d55c77c84 +SHA512 (fcitx5-5.1.7_dict.tar.xz) = 0bc11065e0c3357471c51bdfa6f752e089a6d361349002e62f4ac952c8a0f1790a27aba195d027b340103eb4a6eef0efec124b8931ac2285e8b1b69ca3487269 +SHA512 (fcitx5-5.1.7_dict.tar.xz.sig) = bd80492c82e1fe6b1aa4fe481d0056cc69a74bd9a45dec378f70a05cde9a928e54e49da51d7aea328b696ab1ac11020483530508497ffe42bb45b7c2b46b7a46 From 8675083ce91aff5ed08af70b0f4b29bb4a4ed4bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 18:59:41 +0000 Subject: [PATCH 72/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 527936b9d29af556879da9c87a7c256abf0b58af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:18:27 +0000 Subject: [PATCH 73/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1a0907a952477ee483253a8e86a3b86adfb81ea3 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Fri, 1 Mar 2024 13:58:58 +0800 Subject: [PATCH 74/88] update to upstream release 5.1.8 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5996120..1c7cdfb 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ results_*/ /fcitx5-5.1.6_dict.tar.xz.sig /fcitx5-5.1.7_dict.tar.xz /fcitx5-5.1.7_dict.tar.xz.sig +/fcitx5-5.1.8_dict.tar.xz +/fcitx5-5.1.8_dict.tar.xz.sig diff --git a/fcitx5.spec b/fcitx5.spec index 1dff458..c8b8359 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.7 +Version: 5.1.8 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index f7901f5..d74b1e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.7_dict.tar.xz) = 0bc11065e0c3357471c51bdfa6f752e089a6d361349002e62f4ac952c8a0f1790a27aba195d027b340103eb4a6eef0efec124b8931ac2285e8b1b69ca3487269 -SHA512 (fcitx5-5.1.7_dict.tar.xz.sig) = bd80492c82e1fe6b1aa4fe481d0056cc69a74bd9a45dec378f70a05cde9a928e54e49da51d7aea328b696ab1ac11020483530508497ffe42bb45b7c2b46b7a46 +SHA512 (fcitx5-5.1.8_dict.tar.xz) = 4472b49cbc3fd20f066bbec4e107eafb5444fffd22feee7b4f5b637d324b03a16e82c950e95624629b984f72a5a62fca73087a032946c4eedb86d8a528c52a43 +SHA512 (fcitx5-5.1.8_dict.tar.xz.sig) = 275b68d71e4b6e0ba8225f45a9e61a39c4476a36d92d545b6b350520938b0af388f2ec3562812129e4cbd0949b81ef0f56fea4ed45fbdb06e5ddcc5b714a866f From 6c87a3fa52d26d0e27e18dc2e49abacf4b03101a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Tue, 23 Apr 2024 11:07:23 +0100 Subject: [PATCH 75/88] update to upstream release 5.1.9 --- .gitignore | 2 ++ fcitx5.spec | 6 +++--- sources | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1c7cdfb..8b5fff0 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,5 @@ results_*/ /fcitx5-5.1.7_dict.tar.xz.sig /fcitx5-5.1.8_dict.tar.xz /fcitx5-5.1.8_dict.tar.xz.sig +/fcitx5-5.1.9_dict.tar.zst +/fcitx5-5.1.9_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index c8b8359..4293c02 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,13 +2,13 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.8 +Version: 5.1.9 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ URL: https://github.com/fcitx/fcitx5 -Source: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.xz -Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.xz.sig +Source: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.zst +Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.zst.sig # Checked by chatting, this key is used to verify fcitx* tarballs Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 Source3: fcitx5-xinput diff --git a/sources b/sources index d74b1e9..a81cb88 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.8_dict.tar.xz) = 4472b49cbc3fd20f066bbec4e107eafb5444fffd22feee7b4f5b637d324b03a16e82c950e95624629b984f72a5a62fca73087a032946c4eedb86d8a528c52a43 -SHA512 (fcitx5-5.1.8_dict.tar.xz.sig) = 275b68d71e4b6e0ba8225f45a9e61a39c4476a36d92d545b6b350520938b0af388f2ec3562812129e4cbd0949b81ef0f56fea4ed45fbdb06e5ddcc5b714a866f +SHA512 (fcitx5-5.1.9_dict.tar.zst) = 5121ee4225dd7f840f99361336d5b996ce52c8a57107d3c4fa4166f1cca8b1c81f326790fc04782fe9aaf1c664c40325163c386b363d96c2434ab6a8aaa80b81 +SHA512 (fcitx5-5.1.9_dict.tar.zst.sig) = 3cd0fbf4e90c0741225069f9f2b69fbfad3d566d9c53763ac88136169ede4c68736526a63ff38ba33723ad04f8524bd5881d963b69130b7f83fceade04cd1d0f From 7288925efbc879fba30305458f77e188e372893f Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 1 Jun 2024 08:00:52 +0800 Subject: [PATCH 76/88] update to upstream release 5.1.10 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b5fff0..fc93b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ results_*/ /fcitx5-5.1.8_dict.tar.xz.sig /fcitx5-5.1.9_dict.tar.zst /fcitx5-5.1.9_dict.tar.zst.sig +/fcitx5-5.1.10_dict.tar.zst +/fcitx5-5.1.10_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index 4293c02..7bf182f 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.9 +Version: 5.1.10 Release: %autorelease Summary: Next generation of fcitx License: LGPLv2+ diff --git a/sources b/sources index a81cb88..5b692b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.9_dict.tar.zst) = 5121ee4225dd7f840f99361336d5b996ce52c8a57107d3c4fa4166f1cca8b1c81f326790fc04782fe9aaf1c664c40325163c386b363d96c2434ab6a8aaa80b81 -SHA512 (fcitx5-5.1.9_dict.tar.zst.sig) = 3cd0fbf4e90c0741225069f9f2b69fbfad3d566d9c53763ac88136169ede4c68736526a63ff38ba33723ad04f8524bd5881d963b69130b7f83fceade04cd1d0f +SHA512 (fcitx5-5.1.10_dict.tar.zst) = 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4 +SHA512 (fcitx5-5.1.10_dict.tar.zst.sig) = 0b386a7a52d9687e311a32ca3a6526d29eeef4b892744bf70f0f07b496d98642aaf00ca31f62cde140c7a6d477890e13e5acced738476e49348cf9dd9fcb5789 From d77b9b29c7afcba764225595f41b45635325d8a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:51:37 +0000 Subject: [PATCH 77/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a4a3765a2e6a9ed79738e828a03374fa376ecc38 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Jul 2024 15:58:15 +0800 Subject: [PATCH 78/88] Disable xinput on Wayland (RHBZ#2256267) --- fcitx5-xinput | 1 + 1 file changed, 1 insertion(+) diff --git a/fcitx5-xinput b/fcitx5-xinput index 3a00a38..e1ca1a9 100644 --- a/fcitx5-xinput +++ b/fcitx5-xinput @@ -1,3 +1,4 @@ +IMSETTINGS_IGNORE_SESSION=*-wayland XIM=fcitx5 XIM_PROGRAM=/usr/bin/fcitx5 ICON="fcitx5" From e25316159ade8b4144217b30a9123c37d08c3288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 09:29:29 +0200 Subject: [PATCH 79/88] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- fcitx5.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fcitx5.spec b/fcitx5.spec index 7bf182f..de9b6a0 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -5,7 +5,8 @@ Name: fcitx5 Version: 5.1.10 Release: %autorelease Summary: Next generation of fcitx -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: https://github.com/fcitx/fcitx5 Source: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.zst Source1: https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-%{version}_dict.tar.zst.sig From 874024dde04ee5fe68fd6b9e28c6f4555df0f5b9 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sat, 5 Oct 2024 18:35:34 +0800 Subject: [PATCH 80/88] Also detect qt6 plugin in xinput script (#2316572) --- fcitx5-xinput | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fcitx5-xinput b/fcitx5-xinput index e1ca1a9..819ea70 100644 --- a/fcitx5-xinput +++ b/fcitx5-xinput @@ -9,7 +9,9 @@ GTK_IM_MODULE=fcitx if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx5.so || \ test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx5.so || \ test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ - test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so; + test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ + test -f /usr/lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \ + test -f /usr/lib64/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so ; then QT_IM_MODULE=fcitx else From f8de8c4be61bddd7164b0b6851ec1eaaea44124a Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 10 Oct 2024 15:20:52 +0800 Subject: [PATCH 81/88] update to upstream release 5.1.11 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fc93b0e..2ee9f90 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ results_*/ /fcitx5-5.1.9_dict.tar.zst.sig /fcitx5-5.1.10_dict.tar.zst /fcitx5-5.1.10_dict.tar.zst.sig +/fcitx5-5.1.11_dict.tar.zst +/fcitx5-5.1.11_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index de9b6a0..1093717 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.10 +Version: 5.1.11 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 5b692b2..1198b4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.10_dict.tar.zst) = 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4 -SHA512 (fcitx5-5.1.10_dict.tar.zst.sig) = 0b386a7a52d9687e311a32ca3a6526d29eeef4b892744bf70f0f07b496d98642aaf00ca31f62cde140c7a6d477890e13e5acced738476e49348cf9dd9fcb5789 +SHA512 (fcitx5-5.1.11_dict.tar.zst) = d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb +SHA512 (fcitx5-5.1.11_dict.tar.zst.sig) = 13b713a228bf4765a9f3c480cc249b078acd42c09975930b6cb3bcf7722077780897dc23a9445fc05d8c4693ab4b4697957d0fef244e24b70794f219485cd538 From d6cf83bad702ba5e987153e9ff4b5700c43f3f32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 17:57:57 +0000 Subject: [PATCH 82/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 32ff03e40f5a85dab6672462005c51cb492d3ba4 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Thu, 23 Jan 2025 10:01:28 +0800 Subject: [PATCH 83/88] update to upstream release 5.1.12 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ee9f90..039daf2 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ results_*/ /fcitx5-5.1.10_dict.tar.zst.sig /fcitx5-5.1.11_dict.tar.zst /fcitx5-5.1.11_dict.tar.zst.sig +/fcitx5-5.1.12_dict.tar.zst +/fcitx5-5.1.12_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index 1093717..387c919 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.11 +Version: 5.1.12 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 1198b4a..008f4a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.11_dict.tar.zst) = d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb -SHA512 (fcitx5-5.1.11_dict.tar.zst.sig) = 13b713a228bf4765a9f3c480cc249b078acd42c09975930b6cb3bcf7722077780897dc23a9445fc05d8c4693ab4b4697957d0fef244e24b70794f219485cd538 +SHA512 (fcitx5-5.1.12_dict.tar.zst) = 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645 +SHA512 (fcitx5-5.1.12_dict.tar.zst.sig) = 87ba7c9c13b74a5471536ab9eca575868ef4dd74faa549f2c5977b5d265e74144054f8567204afa061c7c4b856ea369a9656b750f22ebd0e83b060df9c9eca15 From 332715bb24d25689c3470f4f53baf080483dce06 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 16 Jun 2025 21:44:37 +0800 Subject: [PATCH 84/88] update to upstream release 5.1.13 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 039daf2..79b8146 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,5 @@ results_*/ /fcitx5-5.1.11_dict.tar.zst.sig /fcitx5-5.1.12_dict.tar.zst /fcitx5-5.1.12_dict.tar.zst.sig +/fcitx5-5.1.13_dict.tar.zst +/fcitx5-5.1.13_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index 387c919..b71dc26 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.12 +Version: 5.1.13 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 008f4a0..5d3cdf1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.12_dict.tar.zst) = 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645 -SHA512 (fcitx5-5.1.12_dict.tar.zst.sig) = 87ba7c9c13b74a5471536ab9eca575868ef4dd74faa549f2c5977b5d265e74144054f8567204afa061c7c4b856ea369a9656b750f22ebd0e83b060df9c9eca15 +SHA512 (fcitx5-5.1.13_dict.tar.zst) = 474629c8951c7e1f7f8714fd7dcf3b1b59203815ee37c30a2e65bda77b4acbe4dd0a020024bea2e5a3183a3b73107cee69793a2e4719454cf3d6a70e2096a71f +SHA512 (fcitx5-5.1.13_dict.tar.zst.sig) = ab985c909a4a7e5da4d2639218cf46aad28ec334fd1d6ac80ad8bd4c52b5416cf1b836420d0f23894090092fbeb23c0af74ca0c76e321c837a1f959b6fd52c6c From 262fbf39cec2d19b4a5ea530ac5d58098df13133 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:22:19 +0000 Subject: [PATCH 85/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3a7385c02defa7836d907f6a51960ba76fac3b56 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 26 Oct 2025 16:56:42 +0000 Subject: [PATCH 86/88] update to upstream release 5.1.15 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79b8146..6a86de2 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,5 @@ results_*/ /fcitx5-5.1.12_dict.tar.zst.sig /fcitx5-5.1.13_dict.tar.zst /fcitx5-5.1.13_dict.tar.zst.sig +/fcitx5-5.1.15_dict.tar.zst +/fcitx5-5.1.15_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index b71dc26..c79e8fb 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.13 +Version: 5.1.15 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 5d3cdf1..9cbdb47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.13_dict.tar.zst) = 474629c8951c7e1f7f8714fd7dcf3b1b59203815ee37c30a2e65bda77b4acbe4dd0a020024bea2e5a3183a3b73107cee69793a2e4719454cf3d6a70e2096a71f -SHA512 (fcitx5-5.1.13_dict.tar.zst.sig) = ab985c909a4a7e5da4d2639218cf46aad28ec334fd1d6ac80ad8bd4c52b5416cf1b836420d0f23894090092fbeb23c0af74ca0c76e321c837a1f959b6fd52c6c +SHA512 (fcitx5-5.1.15_dict.tar.zst) = 607909917913c0e9923acabf72bac59cb4e8749ac6a40e2c5a65d8c0146788cc751c72a5d36efb4650cdc069be491e54e44f7533d5319f07f496fcf5a20fc360 +SHA512 (fcitx5-5.1.15_dict.tar.zst.sig) = 4fc676d52aee164a3e5d27af789f6f950d46e1828d90f1406b8a816c0f9d7617617e697820e3f43e72d4ab7ada809177f7ff0fad681a5d4c2f72e6f2e88ca500 From 5ddb363a1366d553097d94d450230500bee02d42 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 26 Oct 2025 18:41:04 +0000 Subject: [PATCH 87/88] update to upstream release 5.1.16 --- .gitignore | 2 ++ fcitx5.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6a86de2..631d834 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,5 @@ results_*/ /fcitx5-5.1.13_dict.tar.zst.sig /fcitx5-5.1.15_dict.tar.zst /fcitx5-5.1.15_dict.tar.zst.sig +/fcitx5-5.1.16_dict.tar.zst +/fcitx5-5.1.16_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index c79e8fb..10fa74d 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.15 +Version: 5.1.16 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. diff --git a/sources b/sources index 9cbdb47..e7329d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.15_dict.tar.zst) = 607909917913c0e9923acabf72bac59cb4e8749ac6a40e2c5a65d8c0146788cc751c72a5d36efb4650cdc069be491e54e44f7533d5319f07f496fcf5a20fc360 -SHA512 (fcitx5-5.1.15_dict.tar.zst.sig) = 4fc676d52aee164a3e5d27af789f6f950d46e1828d90f1406b8a816c0f9d7617617e697820e3f43e72d4ab7ada809177f7ff0fad681a5d4c2f72e6f2e88ca500 +SHA512 (fcitx5-5.1.16_dict.tar.zst) = 5d9b340f8be725b61a52d9a0f6f2bd9172f01262f37633c5db6177dd128873db51bbf8222e2117723f423fbd7035c97d3eb447ac587b73c5f17923c12597bc47 +SHA512 (fcitx5-5.1.16_dict.tar.zst.sig) = 5dffb6c45da1653a56b5ee925eda04b6b2652055016dbb2c18dc0b99bc8f5253871846c40e4ec2463cf7b08afc5ca352a51688f41f8f6fad4e41332def854a7b From b6a309b2accb9196e9ec0dafa26f45102d6d86e7 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Mon, 22 Dec 2025 15:47:10 +0000 Subject: [PATCH 88/88] update to upstream release 5.1.17 --- .gitignore | 2 ++ fcitx5.spec | 13 +++++++------ sources | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 631d834..97b3028 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,5 @@ results_*/ /fcitx5-5.1.15_dict.tar.zst.sig /fcitx5-5.1.16_dict.tar.zst /fcitx5-5.1.16_dict.tar.zst.sig +/fcitx5-5.1.17_dict.tar.zst +/fcitx5-5.1.17_dict.tar.zst.sig diff --git a/fcitx5.spec b/fcitx5.spec index 10fa74d..f0e1557 100644 --- a/fcitx5.spec +++ b/fcitx5.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$ Name: fcitx5 -Version: 5.1.16 +Version: 5.1.17 Release: %autorelease Summary: Next generation of fcitx # Automatically converted from old format: LGPLv2+ - review is highly recommended. @@ -46,6 +46,7 @@ BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: /usr/bin/appstream-util +BuildRequires: cmake(nlohmann_json) Requires: dbus-common Requires: %{name}-data = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -101,7 +102,7 @@ This package will setup autostart and environment needed for fcitx5 to work prop %build %cmake -GNinja -%cmake_build +%cmake_build %install %cmake_install @@ -112,7 +113,7 @@ install -d %{buildroot}%{_datadir}/%{name}/table desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-configtool.desktop - + desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/org.fcitx.Fcitx5.desktop @@ -120,7 +121,7 @@ desktop-file-install --delete-original \ desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-wayland-launcher.desktop - + # convert symlinked icons to copied icons, this will help co-existing with # fcitx4 for iconfile in $(find %{buildroot}%{_datadir}/icons -type l) @@ -128,7 +129,7 @@ do origicon=$(readlink -f ${iconfile}) rm -f ${iconfile} cp ${origicon} ${iconfile} -done +done appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %find_lang %{name} @@ -147,7 +148,7 @@ fi %files -f %{name}.lang %license LICENSES/LGPL-2.1-or-later.txt -%doc README.md +%doc README.md %config %{_xinputconf} %{_bindir}/%{name} %{_bindir}/%{name}-configtool diff --git a/sources b/sources index e7329d1..654c39a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fcitx5-5.1.16_dict.tar.zst) = 5d9b340f8be725b61a52d9a0f6f2bd9172f01262f37633c5db6177dd128873db51bbf8222e2117723f423fbd7035c97d3eb447ac587b73c5f17923c12597bc47 -SHA512 (fcitx5-5.1.16_dict.tar.zst.sig) = 5dffb6c45da1653a56b5ee925eda04b6b2652055016dbb2c18dc0b99bc8f5253871846c40e4ec2463cf7b08afc5ca352a51688f41f8f6fad4e41332def854a7b +SHA512 (fcitx5-5.1.17_dict.tar.zst) = fe3f13d7615ae823b0746bd731d0eac4df90b216c22c186c4f63ab71c0450f38adfa558e906a5493bb5eab873bffea913477c8dcb2ba7055668305cf995e235f +SHA512 (fcitx5-5.1.17_dict.tar.zst.sig) = ea98a9ebaf3d77043b461bf8a6691c57e28d7149d19dcd9c54bc0e4923fd176c6435185a65960cdfdb47c0129983c027b31a3bbdb515c1226fb7240c5600a781