From dc5787f29e66718d89c50dbc1438079410fdebaa Mon Sep 17 00:00:00 2001
From: Peng Huang <phuang@fedoraproject.org>
Date: Tue, 7 Apr 2009 10:45:15 +0000
Subject: [PATCH] Update tarball & fix bug 494511

---
 ibus-default-hotkeys.patch | 32 --------------------------------
 ibus.spec                  |  9 ++++++---
 sources                    |  2 +-
 3 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 ibus-default-hotkeys.patch

diff --git a/ibus-default-hotkeys.patch b/ibus-default-hotkeys.patch
deleted file mode 100644
index 7a4af7a..0000000
--- a/ibus-default-hotkeys.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index 9a6330d..9c0345f 100644
---- a/data/ibus.schemas.in
-+++ b/data/ibus.schemas.in
-@@ -18,17 +18,11 @@
-       <owner>ibus</owner>
-       <type>list</type>
-       <list_type>string</list_type>
-+      <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul]</default>
-       <locale name="C">
--        <default>[Control+space]</default>
-         <short>Trigger Hotkey</short>
- 	    <long>Trigger hotkey for enable or disable input context</long>
-       </locale>
--      <locale name="ja">
--        <default>[Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave]</default>
--	  </locale>
--      <locale name="ko">
--        <default>[Hangul,Shift+space]</default>
--	  </locale>
-     </schema>
-     <schema>
-       <key>/schemas/desktop/ibus/general/hotkey/next_engine</key>
-@@ -36,7 +30,7 @@
-       <owner>ibus</owner>
-       <type>list</type>
-       <list_type>string</list_type>
--      <default>[]</default>
-+      <default>[Alt+Shift_L]</default>
-       <locale name="C">
-         <short>Next Engine Hotkey</short>
- 	    <long>Next engine hotkey for switch to next input method engine</long>
diff --git a/ibus.spec b/ibus.spec
index 396bd18..6c1f03d 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090407
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -16,7 +16,6 @@ URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 Patch0:     ibus-HEAD.patch
-Patch1:     ibus-default-hotkeys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -109,7 +108,6 @@ docs for ibus.
 # rm -rf docs/reference/ibus/ibus-sections.txt
 # %patch0 -p1
 # ./autogen.sh --help
-%patch1 -p1
 
 %build
 %configure --disable-static \
@@ -220,6 +218,11 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 07 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090407-3
+- Update the tarball.
+- Fix bug 494511 - ibus-gtk makes gnome-terminal abort 
+  when a key is pressed
+
 * Tue Apr 07 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090407-2
 - Update default hotkey settings.
 
diff --git a/sources b/sources
index 5d62911..938a476 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64c9b4d9bd33cf63082d73ce96454b5b  ibus-1.1.0.20090407.tar.gz
+6b335d802d131f6937613da7cd6da011  ibus-1.1.0.20090407.tar.gz