Merge branch 'master' into f16

Conflicts:
	fcitx.spec

.gitignore

@@ -7,3 +7,4 @@
 /fcitx-4.2.2_dict.tar.xz
 /fcitx-4.2.3_dict.tar.xz
 /fcitx-4.2.4_dict.tar.xz
+/fcitx-4.2.5_dict.tar.xz

fcitx.spec

@@ -4,8 +4,8 @@
 
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
-Version:		4.2.4
-Release:		2.1%{?dist}
+Version:		4.2.5
+Release:		1.1%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -204,6 +204,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_bindir}/readPYMB
 %{_bindir}/scel2org
 %{_bindir}/txt2mb
+%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 %{_datadir}/applications/%{name}-skin-installer.desktop
 %{_datadir}/applications/%{name}-configtool.desktop
 %{_datadir}/applications/%{name}.desktop
@@ -305,9 +306,21 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Tue Jul 24 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.5-1.1
+- Disable GIR Binding on Fedora 16
+
+* Sun Jul 22 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.5-1
+- Upstream to fcitx-4.2.5
+
 * Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2.1
 - Disable GIR Binding on Fedora 16
 
+- Upstream to fcitx-4.2.5
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+>>>>>>> master
+
 * Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2
 - Drop fcitx-keyboard
 - Divide Table Engine into fcitx-table

sources

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