Merge branch 'master' into f15

2012-05-07 23:00:07 +08:00 · 2012-05-07 23:00:07 +08:00 · 6890ab90c7
commit 6890ab90c7
parent 0e75cad75c e03078b533
3 changed files with 8 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@
 /fcitx-4.1.2_all.tar.bz2
 /fcitx-4.2.0_dict.tar.bz2
 /fcitx-4.2.2_dict.tar.xz
+/fcitx-4.2.3_dict.tar.xz
--- a/fcitx.spec
+++ b/fcitx.spec
@ -4,8 +4,8 @@

 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
-Version:		4.2.2
-Release:		2%{?dist}
+Version:		4.2.3
+Release:		1%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@ -258,9 +258,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :


 %changelog
+* Mon May 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.3-1
+- Upgrade to fcitx-4.2.3
+
 * Fri Apr 26 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.2-2
- Build with %cmake macro (rhbz 738016)
- Fix the ownership of directories (rhbz 816513)
+- Upgrade to fcitx-4.2.2

 * Sun Apr 22 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.2-1
 - Upgrade to fcitx-4.2.2
--- a/2
+++ b/2
@ -1 +1 @@
-d4095a7f22a37abad3ee62334fb99c2b  fcitx-4.2.2_dict.tar.xz
+6b0a5878257c5490e367abdbf38a990e  fcitx-4.2.3_dict.tar.xz