[fcitx/f16: 3/3] Merge branch 'master' into f16

[Liang Suilong]

commit 80378aaf281d7053beca31aa16e54ae3825ce9d3
Merge: 6f1a198 5c7ea7f
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Thu Jun 7 01:31:34 2012 +0800

    Merge branch 'master' into f16
    
    Conflicts:
    	fcitx.spec

 fcitx.spec |   65 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 34 insertions(+), 31 deletions(-)
---
diff --cc fcitx.spec
index e6af586,3d5cf19..fd7b470
--- a/fcitx.spec
+++ b/fcitx.spec
@@@ -5,7 -5,7 +5,7 @@@
  Name:			fcitx
  Summary:		Free Chinese Input Toy for X (XIM)
  Version:		4.2.4
- Release:		1.1%{?dist}
 -Release:		2%{?dist}
++Release:		2.1%{?dist}
  License:		GPLv2+
  Group:			User Interface/Desktops
  URL:			http://code.google.com/p/%{name}/
@@@ -218,12 -224,11 +224,9 @@@ update-desktop-database %{_datadir}/app
  %doc
  %{_bindir}/fcitx4-config
  %{_libdir}/libfcitx*.so.*
- %{_libdir}/%{name}/%{name}-[!pkxq]*.so
- %{_libdir}/%{name}/%{name}-x11.so
- %{_libdir}/%{name}/%{name}-xim.so
+ %{_libdir}/%{name}/%{name}-[!pqt]*.so
  %{_libdir}/%{name}/%{name}-punc.so
- %{_libdir}/%{name}/%{name}-kimpanel-ui.so
  %{_libdir}/%{name}/%{name}-quickphrase.so
 -%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
 -%{_datadir}/gir-1.0/Fcitx-1.0.gir
  
  %files data
  %defattr(-,root,root,-)
@@@ -311,9 -307,11 +305,18 @@@
  
  
  %changelog
++<<<<<<< HEAD
++* Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2.1
++- Disable GIR Binding on Fedora 16
++
+ * 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
+ 
 +* Wed Jun 06 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-1.1
 +- Disable GIR Binding on Fedora 16
 +
  * 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