From 25da6b0598a09742c23c44b8fc15a5128779c435 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <fujiwara@fedoraproject.org>
Date: Fri, 27 Nov 2009 07:02:28 +0000
Subject: [PATCH] Fix bug 520989 - ibus-anthy icon enhancement Fix bug 531696 -
 ibus-anthy     KeyError is still reported by abrt Fix bug 536716 -
 ibus-anthy: Symbol     type change support in ibus-anthy

---
 .cvsignore            |  3 ++-
 ibus-anthy-HEAD.patch | 40 +---------------------------------------
 ibus-anthy.spec       | 15 +++++++++++----
 sources               |  3 ++-
 4 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0066ce4..b0d8dab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-ibus-anthy-1.2.0.20090917.tar.gz
+ibus-anthy-1.2.0.20091127.tar.gz
+ibus-anthy.png
diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch
index 6a58676..8b13789 100644
--- a/ibus-anthy-HEAD.patch
+++ b/ibus-anthy-HEAD.patch
@@ -1,39 +1 @@
-diff --git a/engine/engine.py b/engine/engine.py
-index 7069b0a..4b93d35 100644
---- a/engine/engine.py
-+++ b/engine/engine.py
-@@ -952,10 +952,10 @@ class Engine(ibus.EngineBase):
-     @classmethod
-     def CONFIG_VALUE_CHANGED(cls, bus, section, name, value):
-         print 'VALUE_CHAMGED =', section, name, value
--        section = section[len(cls.__prefs._prefix) + 1:]
--        if section == cls._get_shortcut_type():
-+        base_sec = section[len(cls.__prefs._prefix) + 1:]
-+        sec = cls._get_shortcut_type()
-+        if base_sec == sec:
-             cmd = '_Engine__cmd_' + name
--            sec = cls._get_shortcut_type()
-             old = cls.__prefs.get_value(sec, name)
-             value = value if value != [''] else []
-             for s in set(old).difference(value):
-@@ -968,12 +968,17 @@ class Engine(ibus.EngineBase):
-                     lambda a, b: cmp(keys.index(a[13:]), keys.index(b[13:])))
- 
-             cls.__prefs.set_value(sec, name, value)
--        elif section == 'common':
--            cls.__prefs.set_value(section, name, value)
-+        elif base_sec == 'common':
-+            cls.__prefs.set_value(base_sec, name, value)
-             if name == 'shortcut_type':
-                 cls.__keybind = cls._mk_keybind()
-+        elif section == 'panel':
-+            # This value is used for ibus.config.set_value only.
-+            pass
-+        elif base_sec:
-+            cls.__prefs.set_value(base_sec, name, value)
-         else:
--            cls.__prefs.set_value(sec, name, value)
-+            cls.__prefs.set_value(section, name, value)
- 
-     @classmethod
-     def _mk_keybind(cls):
+
diff --git a/ibus-anthy.spec b/ibus-anthy.spec
index 588a513..087669c 100644
--- a/ibus-anthy.spec
+++ b/ibus-anthy.spec
@@ -1,14 +1,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
-Version:    1.2.0.20090917
-Release:    2%{?dist}
+Version:    1.2.0.20091127
+Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     ibus-anthy-HEAD.patch
+Source1:    ibus-anthy.png
+# Patch0:     ibus-anthy-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +31,8 @@ libanthy.
 
 %prep
 %setup -q
-%patch0 -p1
+cp %SOURCE1 icons
+# %patch0 -p1
 
 %build
 %configure --disable-static
@@ -58,6 +60,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Nov 27 2009 Takao Fujiwara <takao.fujiwara1@gmail.com> - 1.2.0.20091127-1
+- Fix bug 520989 - ibus-anthy icon enhancement
+- Fix bug 531696 - ibus-anthy KeyError is still reported by abrt
+- Fix bug 536716 - ibus-anthy: Symbol type change support in ibus-anthy
+
 * Fri Oct 23 2009 Takao Fujiwara <takao.fujiwara1@gmail.com> - 1.2.0.20090917-2
 - Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt
 
diff --git a/sources b/sources
index 81f4ba1..546379e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b6f1d830346e447908d670bc267391a9  ibus-anthy-1.2.0.20090917.tar.gz
+254af64a72c3fed326022c9683e6830f  ibus-anthy-1.2.0.20091127.tar.gz
+c174f5f5d940fdb42e1c3c9bcd4c636f  ibus-anthy.png