From 1bca90a9e5b7e062901091a0f2d7a456bfaf0503 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 22 Dec 2010 18:03:38 +0900
Subject: [PATCH] Update to 1.3.1-12.

---
 ibus-m17n-surrounding-text.patch | 39 +++++++++++++++++++++++++++-----
 ibus-m17n.spec                   |  5 +++-
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/ibus-m17n-surrounding-text.patch b/ibus-m17n-surrounding-text.patch
index b1ed3fb..ee22a90 100644
--- a/ibus-m17n-surrounding-text.patch
+++ b/ibus-m17n-surrounding-text.patch
@@ -1,17 +1,18 @@
-From 6bec9368e23e2637e81b7b6b56b02a88d5f2bbda Mon Sep 17 00:00:00 2001
+From e4f14d6d0755dc315c850eaef6f46fd1596b2da7 Mon Sep 17 00:00:00 2001
 From: Daiki Ueno <ueno@unixuser.org>
 Date: Wed, 15 Sep 2010 12:21:35 +0900
 Subject: [PATCH] Support surrounding-text commands.
 
 ---
- src/engine.c |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 48 insertions(+), 3 deletions(-)
+ src/engine.c   |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/m17nutil.c |    8 ++++++++
+ 2 files changed, 56 insertions(+), 3 deletions(-)
 
 diff --git a/src/engine.c b/src/engine.c
-index 260a806..73d6ef2 100644
+index 5fbe46f..e5dad3e 100644
 --- a/src/engine.c
 +++ b/src/engine.c
-@@ -812,8 +812,53 @@ ibus_m17n_engine_callback (MInputContext *context,
+@@ -966,8 +966,53 @@ ibus_m17n_engine_callback (MInputContext *context,
      }
      else if (command == Minput_reset) {
      }
@@ -68,6 +69,32 @@ index 260a806..73d6ef2 100644
 +                                                 0, len);
      }
  }
+diff --git a/src/m17nutil.c b/src/m17nutil.c
+index 8fac1fe..3865931 100644
+--- a/src/m17nutil.c
++++ b/src/m17nutil.c
+@@ -96,6 +96,13 @@ ibus_m17n_parse_color (const gchar *hex)
+     return color;
+ }
+ 
++#define DEFAULT_REQUIRES (IBUS_CAP_PREEDIT_TEXT |   \
++                          IBUS_CAP_AUXILIARY_TEXT | \
++                          IBUS_CAP_LOOKUP_TABLE |   \
++                          IBUS_CAP_FOCUS |          \
++                          IBUS_CAP_PROPERTY | \
++                          IBUS_CAP_SURROUNDING_TEXT)
++
+ static IBusEngineDesc *
+ ibus_m17n_engine_new (MSymbol  lang,
+                       MSymbol  name,
+@@ -127,6 +134,7 @@ ibus_m17n_engine_new (MSymbol  lang,
+                                            "icon",        engine_icon ? engine_icon : "",
+                                            "layout",      "us",
+                                            "rank",        config->rank,
++                                           "requires",    DEFAULT_REQUIRES,
+                                            NULL);
+ 
+     g_free (engine_name);
 -- 
-1.7.2.3
+1.7.3.4
 
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index a901c6e..467317c 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.3.1
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Wed Dec 22 2010 Daiki Ueno <dueno@redhat.com> - 1.3.1-12
+- Update surrounding-text patch.
+
 * Fri Dec 10 2010 Daiki Ueno <dueno@redhat.com> - 1.3.1-11
 - Update ibus-m17n-HEAD.patch.
 - Lower si-samanala.mim rank per request from a Sinhala user.