From e477c332215c34179ea39e6e5f52b78d6c29783d Mon Sep 17 00:00:00 2001
From: Fedora <fedora@fedora-desktop.(none)>
Date: Sat, 4 Feb 2012 13:43:40 +0800
Subject: [PATCH] Bump into 4.2.0

---
 .gitignore |  1 +
 fcitx.spec | 18 +++++++++++-------
 sources    |  1 +
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 355c694..feed4d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /fcitx-4.1.0_all.tar.bz2
 /fcitx-4.1.1_all.tar.bz2
 /fcitx-4.1.2_all.tar.bz2
+/fcitx-4.2.0_dict.tar.bz2
diff --git a/fcitx.spec b/fcitx.spec
index 632df35..bce5ea4 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -4,12 +4,12 @@
 
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
-Version:		4.1.2
-Release:		3%{?dist}
+Version:		4.2.0
+Release:		1%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
-Source0:		http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.bz2
+Source0:		http://%{name}.googlecode.com/files/%{name}-%{version}_dict.tar.bz2
 Source1:		xinput-%{name}
 BuildRequires:		pango-devel, dbus-devel, opencc-devel
 BuildRequires:		wget, intltool, chrpath, sysconftool, opencc
@@ -123,7 +123,7 @@ install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
 
 desktop-file-install --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-kimpanel.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-skin-installer.desktop
 
 desktop-file-install --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -179,7 +179,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_bindir}/scel2org
 %{_bindir}/txt2mb
 %{_datadir}/applications/%{name}-skin-installer.desktop
-%{_datadir}/applications/%{name}-kimpanel.desktop
 %{_datadir}/applications/%{name}-configtool.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/x-fskin.xml
@@ -205,13 +204,14 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %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/24x24/status/*.png
 %{_datadir}/icons/hicolor/48x48/status/*.png
-%{_datadir}/icons/hicolor/32x32/status/*.png
+%{_datadir}/icons/hicolor/scabable/status/*.svg
 %{_datadir}/%{name}/data/
 %{_datadir}/%{name}/configdesc/
 %{_datadir}/%{name}/pinyin/
@@ -219,6 +219,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_datadir}/%{name}/addon/
 %{_datadir}/%{name}/table/wbx.conf
 %{_datadir}/%{name}/table/wbx.mb
+%{_datadir}/%{name}/inputmethod/*.conf
 
 %files devel
 %defattr(-,root,root,-)
@@ -260,6 +261,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Sat Feb 04 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.0-1
+- Upgrade to fcitx-4.2.0
+
 * Sun Dec 25 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.2-3
 - Fix the spec
 
diff --git a/sources b/sources
index f5c23d6..567481a 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 f2dc0a64567207fa6be686faf0ccab66  fcitx-4.1.0_all.tar.bz2
 d05c606ea5a4ff142e5986c191fef97f  fcitx-4.1.1_all.tar.bz2
 592bc4b18e19b884df78a266007a70f8  fcitx-4.1.2_all.tar.bz2
+22eaf3f4214be10b7aae6a79930bbf23  fcitx-4.2.0_dict.tar.bz2