From 1eb4d1c57bc8e89eee8f6b2756ff807d5278ef1f Mon Sep 17 00:00:00 2001
From: Peng Huang <phuang@fedoraproject.org>
Date: Oct 24 2009 03:46:02 +0000
Subject: Update to 1.2.0.20091024


---

diff --git a/.cvsignore b/.cvsignore
index 71b90c4..3482bd2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ibus-1.2.0.20090927.tar.gz
+ibus-1.2.0.20091024.tar.gz
diff --git a/ibus.spec b/ibus.spec
index 4fa30b1..4a42564 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090927
+Version:    1.2.0.20091024
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -33,7 +33,6 @@ BuildRequires:  gtk-doc
 BuildRequires:  GConf2-devel
 BuildRequires:  pygobject2-devel
 BuildRequires:  intltool
-# BuildRequires:  qt-devel
 
 Requires:   %{name}-libs = %{version}-%{release}
 Requires:   %{name}-gtk = %{version}-%{release}
@@ -83,15 +82,6 @@ Requires(post): glib2 >= %{glib_ver}
 %description gtk
 This package contains ibus im module for gtk2
 
-# %package qt
-# Summary:    IBus im module for qt4
-# Group:      System Environment/Libraries
-# Requires:   %{name} = %{version}-%{release}
-# Requires:   qt >= 4.4.2
-# 
-# %description qt
-# This package contains ibus im module for qt4
-
 %package devel
 Summary:    Development tools for ibus
 Group:      Development/Libraries
@@ -203,8 +193,7 @@ fi
 %{_bindir}/ibus-setup
 %{_datadir}/ibus/*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/*/status/*
+%{_datadir}/icons/hicolor/*/apps/*
 %{_libexecdir}/ibus-gconf
 %{_libexecdir}/ibus-ui-gtk
 %{_libexecdir}/ibus-x11
@@ -234,6 +223,13 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Oct 24 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.2001024-1
+- Update to 1.2.0.20091024
+
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.2001014-2
+- Update to 1.2.0.20091014
+- Change ICON in ibus.conf 
+
 * Mon Sep 27 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090927-1
 - Update to 1.2.0.20090927
 
diff --git a/sources b/sources
index 0abbddc..c249928 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-300bf18ac0a4d3f1364412a52c9e9746  ibus-1.2.0.20090927.tar.gz
+2133a37805abff86f6aa160f08dcd4f4  ibus-1.2.0.20091024.tar.gz
diff --git a/xinput-ibus b/xinput-ibus
index 9adcb2f..3efb736 100644
--- a/xinput-ibus
+++ b/xinput-ibus
@@ -1,6 +1,6 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="/usr/share/pixmaps/ibus.svg"
+ICON="/usr/share/icons/hicolor/scalable/apps/ibus.svg"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"