rpms/fcitx
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f16

Browse Source
This commit is contained in:
Fedora 2012-06-06 01:17:50 +08:00
commit ba2ce111a5
3 changed files with 98 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/fcitx-4.2.0_dict.tar.bz2
/fcitx-4.2.2_dict.tar.xz
/fcitx-4.2.3_dict.tar.xz
/fcitx-4.2.4_dict.tar.xz

126
fcitx.spec
View File

@ -4,7 +4,7 @@
Name: fcitx
Summary: Free Chinese Input Toy for X (XIM)
Version: 4.2.3
Version: 4.2.4
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
@ -15,8 +15,11 @@ BuildRequires: pango-devel, dbus-devel, opencc-devel
BuildRequires: wget, intltool, chrpath, sysconftool, opencc
BuildRequires: cmake, libtool, doxygen, libicu-devel
BuildRequires: qt-devel, gtk3-devel, gtk2-devel, libicu
BuildRequires: xorg-x11-proto-devel, xorg-x11-xtrans-devel
BuildRequires: gobject-introspection-devel, libxkbfile-devel
BuildRequires: enchant-devel, iso-codes-devel, libicu-devel
BuildRequires: libX11-devel, qt-x11, dbus-glib-devel, dbus-x11
BuildRequires: desktop-file-utils
BuildRequires: desktop-file-utils, libxml2-devel
Requires: %{name}-data = %{version}-%{release}
Requires: imsettings
Requires(post): %{_sbindir}/alternatives
@ -60,6 +63,7 @@ Summary: Chinese table of FCITX
Group: System Environment/Libraries
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release}
%description table-chinese
The %{name}-table-chinese package provides other Chinese table for FCITX.
@ -92,13 +96,40 @@ Requires: %{name}-libs = %{version}-%{release}
%description qt4
This package contains fcitx im module for qt4.
%package pinyin
Summary: Pinyin Engine for Fcitx
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
%description pinyin
This package contains pinyin engine for fcitx.
%package keyboard
Summary: X Keyboard integration with Fcitx
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
%description keyboard
Fcitx-keyboard integrates Fcitx into X keyboard, requires X window system.
%package qw
Summary: Quwei Engine for Fcitx
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
%description qw
This package contains quwei engine for fcitx.
%prep
%setup -q
%build
mkdir -p build
pushd build
%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On
%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On-DENABLE_LUA=On -DENABLE_GIR=On
make VERBOSE=1 %{?_smp_mflags}
%install
@ -107,16 +138,6 @@ make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
rm -f %{buildroot}%{_libdir}/*.la
popd
# remove rpath
#chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase}
# fix doc path
#mkdir __doc
#mv %{buildroot}%{_datadir}/%{name}/doc/* __doc
#rm -rf %{buildroot}%{_datadir}/%-DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On{name}/doc
#rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile}
# install xinput config file
install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
%find_lang %{name}
@ -167,7 +188,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog THANKS TODO COPYING
#%doc __doc/*
%config %{_xinputconf}
%{_bindir}/fcitx-*
%{_bindir}/fcitx
@ -192,14 +212,18 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%{_mandir}/man1/readPYMB.1.gz
%{_mandir}/man1/scel2org.1.gz
%{_mandir}/man1/txt2mb.1.gz
%{_datadir}/%{name}/
%files libs
%defattr(-,root,root,-)
%doc
%{_bindir}/fcitx4-config
%{_libdir}/libfcitx*.so.*
%{_libdir}/%{name}/
%{_libdir}/%{name}/%{name}-[!pkxq]*.so
%{_libdir}/%{name}/%{name}-x11.so
%{_libdir}/%{name}/%{name}-xim.so
%{_libdir}/%{name}/%{name}-punc.so
%{_libdir}/%{name}/%{name}-kimpanel-ui.so
%{_libdir}/%{name}/%{name}-quickphrase.so
%files data
%defattr(-,root,root,-)
@ -216,7 +240,17 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%{_datadir}/icons/hicolor/48x48/status/*.png
%{_datadir}/icons/hicolor/scalable/status/*.svg
%{_datadir}/icons/gnome/scalable/status/*.svg
%{_datadir}/%{name}/inputmethod/
%{_datadir}/%{name}/skin/
%{_datadir}/%{name}/addon/%{name}-[!pkxq]*.conf
%{_datadir}/%{name}/addon/%{name}-x11.conf
%{_datadir}/%{name}/addon/%{name}-xim.conf
%{_datadir}/%{name}/addon/%{name}-punc.conf
%{_datadir}/%{name}/addon/%{name}-kimpanel-ui.conf
%{_datadir}/%{name}/addon/%{name}-quickphrase.conf
%{_datadir}/%{name}/data/
%{_datadir}/%{name}/configdesc/[!f]*.desc
%{_datadir}/%{name}/configdesc/fcitx-[!kpx]*.desc
%{_datadir}/%{name}/configdesc/fcitx-xim.desc
%files devel
%defattr(-,root,root,-)
@ -229,20 +263,39 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%files table-chinese
%defattr(-,root,root,-)
%doc
%{_datadir}/%{name}/table/qxm.conf
%{_datadir}/%{name}/table/qxm.mb
%{_datadir}/%{name}/table/cangjie.conf
%{_datadir}/%{name}/table/cj.mb
%{_datadir}/%{name}/table/db.conf
%{_datadir}/%{name}/table/db.mb
%{_datadir}/%{name}/table/erbi.conf
%{_datadir}/%{name}/table/erbi.mb
%{_datadir}/%{name}/table/wanfeng.conf
%{_datadir}/%{name}/table/wanfeng.mb
%{_datadir}/%{name}/table/wbpy.conf
%{_datadir}/%{name}/table/wbpy.mb
%{_datadir}/%{name}/table/zrm.conf
%{_datadir}/%{name}/table/zrm.mb
%{_datadir}/%{name}/table/
%{_datadir}/%{name}/imicon/[!ps]*.png
%files pinyin
%defattr(-,root,root,-)
%doc
%{_datadir}/%{name}/inputmethod/pinyin.conf
%{_datadir}/%{name}/inputmethod/shuangpin.conf
%{_datadir}/%{name}/pinyin/
%{_datadir}/%{name}/configdesc/fcitx-pinyin.desc
%{_datadir}/%{name}/addon/fcitx-pinyin.conf
%{_datadir}/%{name}/imicon/pinyin.png
%{_datadir}/%{name}/imicon/shuangpin.png
%{_libdir}/%{name}/%{name}-pinyin.so
%files qw
%defattr(-,root,root,-)
%doc
%{_datadir}/%{name}/inputmethod/qw.conf
%{_libdir}/%{name}/%{name}-qw.so
%{_datadir}/%{name}/addon/fcitx-qw.conf
%files keyboard
%defattr(-,root,root,-)
%doc
%{_datadir}/%{name}/configdesc/fcitx-keyboard.desc
%{_datadir}/%{name}/configdesc/fcitx-xkb.desc
%{_libdir}/%{name}/%{name}-keyboard.so
%{_libdir}/%{name}/%{name}-xkb.so
%{_libdir}/%{name}/%{name}-xkbdbus.so
%{_datadir}/%{name}/addon/fcitx-keyboard.conf
%{_datadir}/%{name}/addon/fcitx-xkb.conf
%{_datadir}/%{name}/addon/fcitx-xkbdbus.conf
%files gtk2
%defattr(-,root,root,-)
@ -251,6 +304,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%files gtk3
%defattr(-,root,root,-)
%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-fcitx.so
%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
%{_datadir}/gir-1.0/Fcitx-1.0.gir
%files qt4
%defattr(-,root,root,-)
@ -258,6 +313,13 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%changelog
* Tue Jun 05 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-1
- Upgrade to fcitx-4.2.4
- Fix the ownership conflict on fcitx and fcitx-data
- Divide Pinyin engine into fcitx-pinyin
- Divide Quwei engine into fcitx-qw
- Divide XKB integration into fcitx-keyboard
* Mon May 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.3-1
- Upgrade to fcitx-4.2.3
@ -294,7 +356,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
- Add fcitx-qt4 as FCITX im module for qt4
* Tue Aug 02 2011 Liang Suilong <liangsuilong@gmail.com> - 4.0.1-5
- Fix that %files lists a wrong address
- Fix that %%files lists a wrong address
- Separate fcitx-libs again
* Tue Aug 02 2011 Liang Suilong <liangsuilong@gmail.com> - 4.0.1-4

1
sources
View File

@ -1 +1,2 @@
6b0a5878257c5490e367abdbf38a990e fcitx-4.2.3_dict.tar.xz
1a6f35409cca6305988db5a5e5c01b02 fcitx-4.2.4_dict.tar.xz