[ibus-m17n] Update to 1.3.4-12

[Daiki Ueno]

commit 43b76373a5bdec2e79a236cd6fb911eb5244b439
Author: Daiki Ueno <dueno at redhat.com>
Date:   Wed Sep 4 16:52:53 2013 +0900

    Update to 1.3.4-12

 ibus-m17n-fix-preedit-color.patch |   29 +++++++++++++++++++++++++++++
 ibus-m17n.spec                    |   15 +++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)
---
diff --git a/ibus-m17n-fix-preedit-color.patch b/ibus-m17n-fix-preedit-color.patch
new file mode 100644
index 0000000..28dace9
--- /dev/null
+++ b/ibus-m17n-fix-preedit-color.patch
@@ -0,0 +1,29 @@
+From e5c742c56abaadaa5d5a018c0d9004bf2d0a100c Mon Sep 17 00:00:00 2001
+From: Mike FABIAN <mfabian at redhat.com>
+Date: Mon, 12 Aug 2013 18:51:59 +0200
+Subject: [PATCH] engine: fix preedit background colour and underlining
+
+BUG=rhbz#995842
+
+Review URL: https://codereview.appspot.com/12688049
+Patch from Mike FABIAN <mfabian at redhat.com>.
+---
+ src/engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index bcc1a71..ca70464 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -282,7 +282,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
+                                         "preedit_underline",
+                                         G_VARIANT_TYPE_INT32);
+         if (value != NULL) {
+-            klass->preedit_background = g_variant_get_int32 (value);
++            klass->preedit_underline = g_variant_get_int32 (value);
+             g_variant_unref (value);
+         }
+ 
+-- 
+1.8.3.1
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 8864a21..4c37526 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -1,7 +1,7 @@
 %global require_ibus_version 1.4.0
 Name:       ibus-m17n
 Version:    1.3.4
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -10,13 +10,14 @@ Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
 # Upstreamed patches:
 Patch0:     ibus-m17n-HEAD.patch
-Patch1:	    ibus-m17n-fix-data-location.patch
+Patch1:     ibus-m17n-fix-data-location.patch
+Patch2:     ibus-m17n-fix-preedit-color.patch
 
 # Fedora specific patches:
 # Enable lv3:ralt_switch option for some Indic engines in default.xml.
 Patch100:     ibus-m17n-xkb-options.patch
 # Don't make the status button clickable (maybe obsolete).
-Patch101:	    ibus-m17n-hide-title-status.patch
+Patch101:     ibus-m17n-hide-title-status.patch
 
 # The following BR is for autogen and not necessary when packging
 # released tarballs.
@@ -28,7 +29,7 @@ BuildRequires:  gnome-common
 BuildRequires:  m17n-lib-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  ibus-devel >= %{require_ibus_version}
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 
 Requires:   ibus >= %{require_ibus_version}
 Requires:   m17n-lib
@@ -42,6 +43,7 @@ the input table maps from m17n-db.
 
 %patch0 -p1 -b .HEAD
 %patch1 -p1 -b .fix-data-location
+%patch2 -p1 -b .fix-preedit-color
 %patch100 -p1 -b .xkb-options
 %patch101 -p1 -b .hide-title-status
 
@@ -68,6 +70,11 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-m17n.
 %{_datadir}/applications/ibus-setup-m17n.desktop
 
 %changelog
+* Wed Sep  4 2013 Daiki Ueno <dueno at redhat.com> - 1.3.4-12
+- Add ibus-m17n-fix-preedit-color.patch
+- Fix bug 995842 - Preedit background colour in ibus-m17n is always
+  black and preedit underlining is always off
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild