[fcitx: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx

[Liang Suilong]

commit 53dbefa81ca67913dfcf93b5e708be17c576994c
Merge: 65f4049 bce090c
Author: Liang Suilong <liangsuilong at gmail.com>
Date:   Sat Feb 2 14:45:13 2013 +0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx
    
    Conflicts:
    	fcitx.spec

 fcitx.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc fcitx.spec
index 175b6d3,1601750..63403d5
--- a/fcitx.spec
+++ b/fcitx.spec
@@@ -4,8 -4,8 +4,8 @@@
  
  Name:			fcitx
  Summary:		Free Chinese Input Toy for X (XIM)
 -Version:		4.2.6.1
 -Release:		3%{?dist}
 +Version:		4.2.7
- Release:		2%{?dist}
++Release:		1%{?dist}
  License:		GPLv2+
  Group:			User Interface/Desktops
  URL:			http://code.google.com/p/%{name}/
@@@ -315,9 -312,9 +315,12 @@@ update-desktop-database %{_datadir}/app
  
  
  %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