Compare commits

..

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

4 changed files with 15 additions and 88 deletions

50
.gitignore vendored
View file

@ -32,53 +32,3 @@ 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
/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
/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
/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
/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
/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
/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
/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
/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.0.15
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
@ -25,7 +24,7 @@ BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(cldr-emoji-annotation)
BuildRequires: pkgconfig(dri)
BuildRequires: pkgconfig(enchant-2)
BuildRequires: pkgconfig(enchant)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(fmt)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@ -46,10 +45,8 @@ 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}
Requires: setup
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
@ -57,18 +54,10 @@ 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+.
%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
@ -82,7 +71,7 @@ The %{name}-data package provides shared data for Fcitx5.
%package devel
Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files necessary for
@ -102,7 +91,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,15 +102,11 @@ 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
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 +114,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,22 +133,18 @@ 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
%{_bindir}/%{name}-remote
%{_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
%{_libdir}/libFcitx5*.so.*.*
%{_libdir}/libFcitx5Config.so.6
%{_libdir}/libFcitx5Core.so.7
%{_libdir}/libFcitx5Utils.so.2
%{_libexecdir}/fcitx5-wayland-launcher
%files devel
%{_includedir}/Fcitx5/
@ -178,7 +159,6 @@ 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

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.0.15_dict.tar.xz) = 94ba90226a859d7e63fc682c3cfed52eb3726f57c0b7e8c42b3acc6a39586403a3bb3c3bf53b9330d430b07032c88381bce08c02e7372709bfecc27d42f62254
SHA512 (fcitx5-5.0.15_dict.tar.xz.sig) = eab645a927de6f564defd2be8fdd355772816408f8311d105c2624da5038846437ec5da6149470aa1b01f28fe42be0b42d3c0e2412ed34e5fb2ef59a9b1e9c78