Update to 4.2.9

- Qt5 im module detected in xinputrc
- BR: gcc-c++, extra-cmake-modules
This commit is contained in:
Robin Lee 2015-10-01 07:27:35 +08:00
parent 66a77492c4
commit a01545373b
4 changed files with 15 additions and 7 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/fcitx-4.2.8.4_dict.tar.xz
/fcitx-4.2.8.6_dict.tar.xz
/xinput-fcitx
/fcitx-4.2.9_dict.tar.xz

View File

@ -4,13 +4,14 @@
Name: fcitx
Summary: An input method framework
Version: 4.2.8.6
Release: 2%{?dist}
Version: 4.2.9
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
URL: https://fcitx-im.org/wiki/Fcitx
Source0: http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
Source1: xinput-%{name}
BuildRequires: gcc-c++
BuildRequires: pango-devel, dbus-devel, opencc-devel
BuildRequires: wget, intltool, chrpath, sysconftool, opencc
BuildRequires: cmake, libtool, doxygen, libicu-devel
@ -20,7 +21,7 @@ BuildRequires: gobject-introspection-devel, libxkbfile-devel
BuildRequires: enchant-devel, iso-codes-devel, libicu-devel
BuildRequires: libX11-devel, dbus-glib-devel, dbus-x11
BuildRequires: desktop-file-utils, libxml2-devel
BuildRequires: lua-devel
BuildRequires: lua-devel, extra-cmake-modules
Requires: %{name}-data = %{version}-%{release}
Requires: imsettings
Requires(post): %{_sbindir}/alternatives
@ -238,7 +239,6 @@ fi
%{_datadir}/applications/%{name}-configtool.desktop
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/x-fskin.xml
#%{_docdir}/%{name}/
%{_mandir}/man1/createPYMB.1*
%{_mandir}/man1/fcitx-remote.1*
%{_mandir}/man1/fcitx.1*
@ -287,13 +287,13 @@ fi
%{_datadir}/dbus-1/services/org.fcitx.Fcitx.service
%files devel
%doc AUTHORS ChangeLog THANKS TODO
%license COPYING
%{_bindir}/fcitx4-config
%{_libdir}/libfcitx*.so
%{_libdir}/pkgconfig/fcitx*.pc
%{_includedir}/fcitx*
%{_datadir}/cmake/%{name}/
%{_docdir}/%{name}/*
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/Fcitx-1.0.gir
@ -339,6 +339,11 @@ fi
%{_libdir}/qt4/plugins/inputmethods/qtim-fcitx.so
%changelog
* Wed Sep 30 2015 Robin Lee <cheeselee@fedoraproject.org> - 4.2.9-1
- Update to 4.2.9
- Qt5 im module detected in xinputrc
- BR: gcc-c++, extra-cmake-modules
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.8.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

View File

@ -1 +1 @@
8dce1a0d65bf19f2a99b456458f8ac41 fcitx-4.2.8.6_dict.tar.xz
c00c72f46cd95f25d15fe87aee543cc1 fcitx-4.2.9_dict.tar.xz

View File

@ -6,7 +6,9 @@ PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
SHORT_DESC="FCITX"
GTK_IM_MODULE=fcitx
if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so || \
test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so;
test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so || \
test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so || \
test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so;
then
QT_IM_MODULE=fcitx
else