From 379e9fe9bef999122b2699a8bc3f75109e98c8ee Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Aug 26 2010 04:56:57 +0000
Subject: Fix #627107 and update ibus-541492-xkb.patch


---

diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch
index 13ccfc6..1415e74 100644
--- a/ibus-541492-xkb.patch
+++ b/ibus-541492-xkb.patch
@@ -1,6 +1,6 @@
-From a3819467deea74b82c55a4cfc8cecd6285f54e00 Mon Sep 17 00:00:00 2001
+From e11c340932b12117b2163ef35faa6d6f5234f1d3 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Mon, 23 Aug 2010 11:31:55 +0900
+Date: Thu, 26 Aug 2010 13:48:49 +0900
 Subject: [PATCH] Add XKB layouts
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH] Add XKB layouts
  ibus/__init__.py           |    2 +
  ibus/bus.py                |    3 +
  ibus/interface/iibus.py    |    3 +
- ibus/xkblayout.py.in       |   86 ++++++
+ ibus/xkblayout.py.in       |   87 ++++++
  ibus/xkbxml.py.in          |  337 +++++++++++++++++++++
  setup/main.py              |  228 ++++++++++++++-
  setup/setup.ui             |  300 +++++++++++++++++++-
@@ -28,7 +28,7 @@ Subject: [PATCH] Add XKB layouts
  xkb/xkblib.h               |   36 +++
  xkb/xkbxml.c               |  695 ++++++++++++++++++++++++++++++++++++++++++++
  xkb/xkbxml.h               |  188 ++++++++++++
- 24 files changed, 2941 insertions(+), 7 deletions(-)
+ 24 files changed, 2942 insertions(+), 7 deletions(-)
  create mode 100644 ibus/xkblayout.py.in
  create mode 100644 ibus/xkbxml.py.in
  create mode 100644 xkb/Makefile.am
@@ -264,10 +264,10 @@ index e63caa3..8b7b6f7 100644
  
 diff --git a/ibus/xkblayout.py.in b/ibus/xkblayout.py.in
 new file mode 100644
-index 0000000..b5f1a06
+index 0000000..e6dfdfd
 --- /dev/null
 +++ b/ibus/xkblayout.py.in
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,87 @@
 +# vim:set et sts=4 sw=4:
 +#
 +# ibus - The Input Bus
@@ -340,7 +340,8 @@ index 0000000..b5f1a06
 +        if need_us_layout:
 +            layout = layout + ",us"
 +        args.append(layout)
-+        os.spawnl(os.P_NOWAIT, *args)
++        pid = os.spawnl(os.P_NOWAIT, *args)
++        os.waitpid(pid, 0)
 +
 +    def set_default_layout(self, layout="default"):
 +        if self.__command == None:
diff --git a/ibus.spec b/ibus.spec
index 484b094..ba0acad 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -11,7 +11,7 @@
 
 Name:       ibus
 Version:    1.3.7
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -269,6 +269,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Aug 26 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.7-2
+- Fix #627107 and update ibus-541492-xkb.patch
+
 * Mon Aug 23 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.7-1
 - Update to 1.3.7