diff --git a/fcitx.spec b/fcitx.spec index e7ab8eb..16bb1d0 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,23 +1,23 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf +%{!?gtk2_binary_version: %define gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)} +%{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)} Name: fcitx Summary: Free Chinese Input Toy for X (XIM) -Version: 4.0.1 -Release: 5%{?dist} +Version: 4.1.0 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://code.google.com/p/%{name}/ -Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.gz +Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.bz2 Source1: xinput-%{name} -Patch0: gnome3-tray-fix.patch -Patch1: gnome3-mainwindow-pos-walkaround.patch -# These two patches are provide by Weng Xuetian, who is fcitx's author. -BuildRequires: pango-devel dbus-devel -BuildRequires: wget intltool chrpath sysconftool -BuildRequires: automake, autoconf, libtool +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 Requires: %{name}-data = %{version}-%{release} Requires: imsettings -Requires(post): %{_sbindir}/alternatives +Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives Requires: %{name}-libs = %{version}-%{release} @@ -50,93 +50,57 @@ Requires: libX11-devel The %{name}-devel package contains libraries and header files necessary for developing programs using FCITX libraries. -%package table-bingchan -Summary: Bingchan table of FCITX +%package table-chinese +Summary: Chinese table of FCITX Group: System Environment/Libraries BuildArch: noarch Requires: %{name} = %{version}-%{release} -%description table-bingchan -The %{name}-table-bingchan package provides Bingchan table for FCITX. +%description table-chinese +The %{name}-table-chinese package provides other Chinese table for FCITX. -%package table-cangjie -Summary: Cangjie table of FCITX +%package gtk2 +Summary: FCITX im module for gtk2 Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} -%description table-cangjie -The %{name}-table-bingchan package provides Cangjie table for FCITX. +%description gtk2 +This package contains ibus im module for gtk2. -%package table-dianbaoma -Summary: Dianbaoma table of FCITX +%package gtk3 +Summary: FCITX im module for gtk3 Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: imsettings-gnome -%description table-dianbaoma -The %{name}-table-dianbaoma package provides Dianbaoma table for FCITX. +%description gtk3 +This package contains fcitx im module for gtk3. -%package table-erbi -Summary: Erbi table of FCITX +%package qt4 +Summary: FCITX im module for qt4 Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} -%description table-erbi -The %{name}-table-erbi package provides Erbi table for FCITX. - -%package table-wanfeng -Summary: Wanfeng table of FCITX -Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description table-wanfeng -The %{name}-table-wanfeng package provides Wanfeng table for FCITX. - -%package table-wbpy -Summary: Wubi-pinyin table of FCITX -Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description table-wbpy -The %{name}-table-wbpy package provides Wubi-pinyin table for FCITX. - -%package table-wubi -Summary: Wubi table of FCITX -Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description table-wubi -The %{name}-table-wubi package provides Wubi table for FCITX. - -%package table-ziranma -Summary: Ziranma table of FCITX -Group: System Environment/Libraries -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description table-ziranma -The %{name}-table-ziranma package provides Ziranma table for FCITX. +%description qt4 +This package contains fcitx im module for qt4. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -./autogen.sh -%configure --disable-static \ - --enable-dbus \ - --enable-tray +mkdir -p build +pushd build +cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} make %{?_smp_mflags} %install +pushd build make install INSTALL="install -p" DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la +popd # remove rpath chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase} @@ -144,7 +108,7 @@ chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase} # fix doc path #mkdir __doc #mv %{buildroot}%{_datadir}/%{name}/doc/* __doc -#rm -rf %{buildroot}%{_datadir}/%{name}/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 @@ -169,12 +133,25 @@ fi %postun libs -p /sbin/ldconfig +%post gtk2 +%{_bindir}/update-gtk-immodules %{_host} || : + +%postun gtk2 +%{_bindir}/update-gtk-immodules %{_host} || : + +%post gtk3 +%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || : + +%postun gtk3 +%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || : + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog THANKS TODO COPYING #%doc __doc/* %config %{_xinputconf} %{_bindir}/* +%{_datadir}/applications/%{name}-kimpanel.desktop %{_datadir}/applications/%{name}-configtool.desktop %{_datadir}/applications/%{name}.desktop %{_docdir}/%{name}/ @@ -192,26 +169,26 @@ fi %defattr(-,root,root,-) %doc %{_libdir}/libfcitx*.so.* +%{_libdir}/%{name}/*.so %files data %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/skin/* -%{_datadir}/pixmaps/* -%{_datadir}/%{name}/data/AutoEng.dat -%{_datadir}/%{name}/data/addon.desc -%{_datadir}/%{name}/data/config.desc -%{_datadir}/%{name}/data/gbks2t.tab -%{_datadir}/%{name}/data/profile.desc -%{_datadir}/%{name}/data/punc.mb -%{_datadir}/%{name}/data/pySym.mb -%{_datadir}/%{name}/data/pybase.mb -%{_datadir}/%{name}/data/pyphrase.mb -%{_datadir}/%{name}/data/skin.desc -%{_datadir}/%{name}/data/sp.dat -%{_datadir}/%{name}/data/table.desc -%{_datadir}/%{name}/data/table/disable-table.conf.template -%{_datadir}/%{name}/data/vk.conf +%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/icons/hicolor/22x22/apps/%{name}.png +%{_datadir}/icons/hicolor/24x24/apps/%{name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%{_datadir}/icons/hicolor/48x48/status/*.png +%{_datadir}/icons/hicolor/32x32/status/*.png +%{_datadir}/%{name}/data/ +%{_datadir}/%{name}/configdesc/ +%{_datadir}/%{name}/pinyin/ +%{_datadir}/%{name}/skin/ +%{_datadir}/%{name}/addon/ +%{_datadir}/%{name}/table/wbx.conf +%{_datadir}/%{name}/table/wbx.mb %files devel %defattr(-,root,root,-) @@ -219,56 +196,46 @@ fi %{_libdir}/libfcitx*.so %{_libdir}/pkgconfig/fcitx*.pc %{_includedir}/fcitx* +%{_datadir}/cmake/%{name}/ -%files table-bingchan +%files table-chinese %defattr(-,root,root,-) %doc -%{_datadir}/%{name}/data/table/qxm.conf -%{_datadir}/%{name}/data/table/qxm.mb +%{_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 -%files table-cangjie +%files gtk2 %defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/cangjie.conf -%{_datadir}/%{name}/data/table/cj.mb +%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-fcitx.so -%files table-dianbaoma +%files gtk3 %defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/db.conf -%{_datadir}/%{name}/data/table/db.mb +%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-fcitx.so -%files table-erbi +%files qt4 %defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/erbi.conf -%{_datadir}/%{name}/data/table/erbi.mb +%{_libdir}/qt4/plugins/inputmethods/libqtim-fcitx.so -%files table-wanfeng -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/wanfeng.conf -%{_datadir}/%{name}/data/table/wanfeng.mb - -%files table-wbpy -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/wbpy.conf -%{_datadir}/%{name}/data/table/wbpy.mb - -%files table-wubi -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/wbx.conf -%{_datadir}/%{name}/data/table/wbx.mb - -%files table-ziranma -%defattr(-,root,root,-) -%doc -%{_datadir}/%{name}/data/table/zrm.conf -%{_datadir}/%{name}/data/table/zrm.mb %changelog +* Fri Sep 09 2011 Liang Suilong - 4.1.0-1 +- Upstream to fcitx-4.1.0 +- Add fcitx-gtk2 as FCITX im module for gtk2 +- Add fcitx-gtk3 as FCITX im module for gtk3 +- Add fcitx-qt4 as FCITX im module for qt4 + * Tue Aug 02 2011 Liang Suilong - 4.0.1-5 - Fix that %files lists a wrong address - Separate fcitx-libs again