Compare commits

..

No commits in common. "rawhide" and "f38" have entirely different histories.

4 changed files with 12 additions and 35 deletions

18
.gitignore vendored
View file

@ -64,21 +64,3 @@ 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
/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
/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
/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
/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

View file

@ -1,4 +1,3 @@
IMSETTINGS_IGNORE_SESSION=*-wayland
XIM=fcitx5
XIM_PROGRAM=/usr/bin/fcitx5
ICON="fcitx5"
@ -9,9 +8,7 @@ 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/lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so || \
test -f /usr/lib64/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so ;
test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so;
then
QT_IM_MODULE=fcitx
else

View file

@ -2,14 +2,13 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
Name: fcitx5
Version: 5.1.17
Version: 5.1.7
Release: %autorelease
Summary: Next generation of fcitx
# Automatically converted from old format: LGPLv2+ - review is highly recommended.
License: LicenseRef-Callaway-LGPLv2+
License: 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
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
@ -46,7 +45,6 @@ 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}
@ -102,7 +100,7 @@ This package will setup autostart and environment needed for fcitx5 to work prop
%build
%cmake -GNinja
%cmake_build
%cmake_build
%install
%cmake_install
@ -113,7 +111,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
@ -121,7 +119,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)
@ -129,7 +127,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}
@ -148,7 +146,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

View file

@ -1,2 +1,2 @@
SHA512 (fcitx5-5.1.17_dict.tar.zst) = fe3f13d7615ae823b0746bd731d0eac4df90b216c22c186c4f63ab71c0450f38adfa558e906a5493bb5eab873bffea913477c8dcb2ba7055668305cf995e235f
SHA512 (fcitx5-5.1.17_dict.tar.zst.sig) = ea98a9ebaf3d77043b461bf8a6691c57e28d7149d19dcd9c54bc0e4923fd176c6435185a65960cdfdb47c0129983c027b31a3bbdb515c1226fb7240c5600a781
SHA512 (fcitx5-5.1.7_dict.tar.xz) = 0bc11065e0c3357471c51bdfa6f752e089a6d361349002e62f4ac952c8a0f1790a27aba195d027b340103eb4a6eef0efec124b8931ac2285e8b1b69ca3487269
SHA512 (fcitx5-5.1.7_dict.tar.xz.sig) = bd80492c82e1fe6b1aa4fe481d0056cc69a74bd9a45dec378f70a05cde9a928e54e49da51d7aea328b696ab1ac11020483530508497ffe42bb45b7c2b46b7a46