[fcitx] Revert all the code to normal

Liang Suilong liangsuilong at fedoraproject.org
Sat Feb 23 15:09:05 UTC 2013


commit d690db7c183452562f69e8d316bd95721c50223f
Author: Liang Suilong <liangsuilong at gmail.com>
Date:   Sat Feb 23 23:08:41 2013 +0800

    Revert all the code to normal

 fcitx.spec   |  415 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources      |    2 +
 xinput-fcitx |   15 ++
 3 files changed, 432 insertions(+), 0 deletions(-)
---
diff --git a/fcitx.spec b/fcitx.spec
new file mode 100644
index 0000000..63403d5
--- /dev/null
+++ b/fcitx.spec
@@ -0,0 +1,415 @@
+%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.2.7
+Release:		1%{?dist}
+License:		GPLv2+
+Group:			User Interface/Desktops
+URL:			http://code.google.com/p/%{name}/
+Source0:		http://%{name}.googlecode.com/files/%{name}-%{version}_dict.tar.xz
+Source1:		xinput-%{name}
+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, libxml2-devel
+Requires:		%{name}-data = %{version}-%{release}
+Requires:		imsettings 
+Requires(post):		%{_sbindir}/alternatives
+Requires(postun):	%{_sbindir}/alternatives
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-gtk3 = %{version}-%{release}
+Requires:		%{name}-gtk2 = %{version}-%{release}
+
+%description
+FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese 
+input methods for Linux. It supports Pinyin, QuWei and Table-based input 
+methods. It's small and fast.
+
+%package data
+Summary:		Data files of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description data
+The %{name}-data package provides shared datas for FCITX.
+
+%package libs
+Summary:		Shared libraries for FCITX
+Group:			System Environment/Libraries
+Provides:		%{name}-keyboard = %{version}-%{release}
+Obsoletes:		%{name}-keyboard =< 4.2.3
+
+%description libs
+The %{name}-libs package provides shared libraries for FCITX
+
+%package devel
+Summary:		Development files for FCITX
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		libX11-devel
+
+%description devel
+The %{name}-devel package contains libraries and header files necessary for
+developing programs using FCITX libraries.
+
+%package table-chinese
+Summary:		Chinese table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+Requires:		%{name}-table = %{version}-%{release}
+
+%description table-chinese
+The %{name}-table-chinese package provides other Chinese table for FCITX.
+
+%package gtk2
+Summary:		FCITX im module for gtk2
+Group:			System Environment/Libraries
+Requires:		%{name} = %{version}-%{release}
+Requires:		%{name}-libs = %{version}-%{release}
+
+%description gtk2
+This package contains ibus im module for gtk2.
+
+%package gtk3
+Summary:		FCITX im module for gtk3
+Group:			System Environment/Libraries
+Requires:		%{name} = %{version}-%{release}
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		imsettings-gnome
+
+%description gtk3
+This package contains fcitx im module for gtk3.
+
+%package qt4
+Summary:		FCITX im module for qt4
+Group:			System Environment/Libraries
+Requires:		%{name} = %{version}-%{release}
+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}
+Requires:		%{name}-data = %{version}-%{release}
+
+%description pinyin
+This package contains pinyin engine for fcitx.
+
+%package qw
+Summary:		Quwei Engine for Fcitx
+Group:			System Environment/Libraries
+Requires:		%{name} = %{version}-%{release}
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-data = %{version}-%{release}
+
+%description qw
+This package contains quwei engine for fcitx.
+
+%package table
+Summary:		Table Engine for Fcitx
+Group:			System Environment/Libraries
+Requires:		%{name} = %{version}-%{release}
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-data = %{version}-%{release}
+Requires:		%{name}-pinyin = %{version}-%{release}
+
+%description table
+This package contains table 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-DENABLE_LUA=On -DENABLE_GIR=On -DENABLE_XDGAUTOSTART=Off
+make VERBOSE=1 %{?_smp_mflags}
+
+%install
+pushd build
+make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+rm -f %{buildroot}%{_libdir}/*.la
+popd
+
+install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
+
+%find_lang %{name}
+
+desktop-file-install --delete-original \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-skin-installer.desktop
+
+desktop-file-install --delete-original \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-configtool.desktop
+
+desktop-file-install --delete-original \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
+%clean
+rm -rf %{buildroot}
+
+%post 
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 55 || :
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+%postun  
+if [ "$1" = "0" ]; then
+  %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
+  # if alternative was set to manual, reset to auto
+  [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
+fi
+update-desktop-database %{_datadir}/applications &>/dev/null || :
+
+%post libs -p /sbin/ldconfig
+
+%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
+%config %{_xinputconf}
+%{_bindir}/fcitx-*
+%{_bindir}/fcitx
+%{_bindir}/createPYMB
+%{_bindir}/mb2org
+%{_bindir}/mb2txt
+%{_bindir}/readPYBase
+%{_bindir}/readPYMB
+%{_bindir}/scel2org
+%{_bindir}/txt2mb
+#%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+%{_datadir}/applications/%{name}-skin-installer.desktop
+%{_datadir}/%{name}/dbus/daemon.conf
+%{_datadir}/applications/%{name}-configtool.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/x-fskin.xml
+%{_docdir}/%{name}/
+%{_mandir}/man1/createPYMB.1.gz
+%{_mandir}/man1/fcitx-remote.1.gz
+%{_mandir}/man1/fcitx.1.gz
+%{_mandir}/man1/mb2org.1.gz
+%{_mandir}/man1/mb2txt.1.gz
+%{_mandir}/man1/readPYBase.1.gz
+%{_mandir}/man1/readPYMB.1.gz
+%{_mandir}/man1/scel2org.1.gz
+%{_mandir}/man1/txt2mb.1.gz
+
+%files libs
+%defattr(-,root,root,-)
+%doc
+%{_bindir}/fcitx4-config
+%{_libdir}/libfcitx*.so.*
+%{_libdir}/%{name}/%{name}-[!pqt]*.so
+%{_libdir}/%{name}/%{name}-punc.so
+%{_libdir}/%{name}/%{name}-quickphrase.so
+%{_libdir}/%{name}/qt/libfcitx-quickphrase-editor.so
+%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
+%{_datadir}/gir-1.0/Fcitx-1.0.gir
+
+%files data
+%defattr(-,root,root,-)
+%doc 
+%{_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/16x16/status/*.png
+%{_datadir}/icons/hicolor/22x22/status/*.png
+%{_datadir}/icons/hicolor/24x24/status/*.png
+%{_datadir}/icons/hicolor/48x48/status/*.png
+%{_datadir}/icons/hicolor/scalable/status/*.svg
+%{_datadir}/icons/gnome/scalable/status/*.svg
+%{_datadir}/%{name}/skin/
+%{_datadir}/%{name}/addon/%{name}-[!pqt]*.conf
+%{_datadir}/%{name}/addon/%{name}-punc.conf
+%{_datadir}/%{name}/addon/%{name}-quickphrase.conf
+%{_datadir}/%{name}/data/
+%{_datadir}/%{name}/spell/
+%{_datadir}/%{name}/configdesc/[!ft]*.desc
+%{_datadir}/%{name}/configdesc/fcitx-[!p]*.desc
+
+%files devel
+%defattr(-,root,root,-)
+%doc 
+%{_libdir}/libfcitx*.so
+%{_libdir}/pkgconfig/fcitx*.pc
+%{_includedir}/fcitx*
+%{_datadir}/cmake/%{name}/
+
+%files table-chinese
+%defattr(-,root,root,-)
+%doc
+%{_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}/configdesc/fcitx-pinyin-enhance.desc
+%{_datadir}/%{name}/addon/fcitx-pinyin.conf
+%{_datadir}/%{name}/addon/fcitx-pinyin-enhance.conf
+%{_datadir}/%{name}/imicon/pinyin.png
+%{_datadir}/%{name}/imicon/shuangpin.png
+%{_libdir}/%{name}/%{name}-pinyin.so
+%{_libdir}/%{name}/%{name}-pinyin-enhance.so
+%{_datadir}/%{name}/py-enhance/
+
+%files qw
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/inputmethod/qw.conf
+%{_libdir}/%{name}/%{name}-qw.so
+%{_datadir}/%{name}/addon/fcitx-qw.conf
+
+%files table
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/configdesc/table.desc
+%{_libdir}/%{name}/%{name}-table.so
+%{_datadir}/%{name}/addon/fcitx-table.conf
+
+%files gtk2
+%defattr(-,root,root,-)
+%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-fcitx.so
+
+%files gtk3
+%defattr(-,root,root,-)
+%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-fcitx.so
+
+%files qt4
+%defattr(-,root,root,-)
+%{_libdir}/qt4/plugins/inputmethods/qtim-fcitx.so
+
+
+%changelog
+* Fri Feb 01 2013 Liang Suilong <liangsuilong at gmail.com> - 4.2.7-1
+- Upstream to fcitx-4.2.7
+
+* Sat Jan 26 2013 Kevin Fenzi <kevin at scrye.com> 4.2.6.1-3
+- Rebuild for new icu
+
+* Mon Nov 26 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.6.1-2
+- Disable xdg-autostart
+
+* Wed Oct 31 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.6.1-1
+- Upstream to fcitx-4.2.6.1
+
+* Sun Jul 22 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.5-1
+- Upstream to fcitx-4.2.5
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2
+- Drop fcitx-keyboard
+- Divide Table Engine into fcitx-table
+- Move GIR Binding into fcitx-libs
+
+* Tue Jun 05 2012 Liang Suilong <liangsuilong at 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 at gmail.com> - 4.2.3-1
+- Upgrade to fcitx-4.2.3
+
+* Fri Apr 26 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.2-2
+- Upgrade to fcitx-4.2.2
+
+* Sun Apr 22 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.2-1
+- Upgrade to fcitx-4.2.2
+
+* Sat Feb 04 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.0-1
+- Upgrade to fcitx-4.2.0
+
+* Sun Dec 25 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.2-3
+- Fix the spec
+
+* Sun Dec 25 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.2-2
+- Fix the spec
+
+* Sun Dec 25 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.2-1
+- Update to 4.1.2
+- move fcitx4-config to devel
+
+* Fri Sep 09 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.1-2
+- Update xinput-fcitx
+- Add fcitx-gtk3 as fcitx requires
+
+* Fri Sep 09 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.1-1
+- Upstream to fcitx-4.1.1
+
+* Fri Sep 09 2011 Liang Suilong <liangsuilong at gmail.com> - 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 <liangsuilong at gmail.com> - 4.0.1-5
+- Fix that %%files lists a wrong address
+- Separate fcitx-libs again
+
+* Tue Aug 02 2011 Liang Suilong <liangsuilong at gmail.com> - 4.0.1-4
+- Separates varieties of tables from FCITX
+- Merge fcitx-libs into fcitx 
+
+* Sun Jul 03 2011 Liang Suilong <liangsuilong at gmail.com> - 4.0.1-3
+- Support GNOME 3 tray icon
+- Fix that main window is covered by GNOME Shell 
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Nov 19 2010 Chen Lei <supercyper at 163.com> - 4.0.0-1
+- Update to 4.0.0
+
+* Mon Jun 14 2010 Chen Lei <supercyper at 163.com> - 3.6.3-5.20100514svn_utf8
+- Remove BR:libXext-devel
+
+* Fri May 14 2010 Chen Lei <supercyper at 163.com> - 3.6.3-4.20100514svn_utf8
+- svn 365
+
+* Sun Apr 18 2010 Chen Lei <supercyper at 163.com> - 3.6.3-3.20100410svn_utf8
+- Exclude xpm files
+
+* Sat Apr 17 2010 Chen Lei <supercyper at 163.com> - 3.6.3-2.20100410svn_utf8
+- Update License tag
+- Add more explanation for UTF-8 branch
+
+* Mon Apr 12 2010 Chen Lei <supercyper at 163.com> - 3.6.3-1.20100410svn_utf8
+- Initial Package
diff --git a/sources b/sources
new file mode 100644
index 0000000..663cceb
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+7dc57dbe41702ec8be856ce3de434f2b  fcitx-4.2.6.1_dict.tar.xz
+6e291717c24615b9dc9bfaa2949af3a7  fcitx-4.2.7_dict.tar.xz
diff --git a/xinput-fcitx b/xinput-fcitx
new file mode 100644
index 0000000..a597cdb
--- /dev/null
+++ b/xinput-fcitx
@@ -0,0 +1,15 @@
+XIM=fcitx
+XIM_PROGRAM=/usr/bin/fcitx
+ICON="/usr/share/pixmaps/fcitx.png"
+XIM_ARGS="-D"
+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;
+then
+    QT_IM_MODULE=fcitx
+else
+    QT_IM_MODULE=xim
+fi
+


More information about the scm-commits mailing list