[mozc/f16] revert layout change in the xml file

[Akira TAGOH]

commit 857fe502a648f4f13dd9357c369cde1989797f8d
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Jun 5 20:51:58 2012 +0900

    revert layout change in the xml file

 mozc-support-new-ibus.patch |   12 +++++-------
 mozc.spec                   |    2 --
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/mozc-support-new-ibus.patch b/mozc-support-new-ibus.patch
index 56236a0..b56901b 100644
--- a/mozc-support-new-ibus.patch
+++ b/mozc-support-new-ibus.patch
@@ -1,12 +1,10 @@
-diff -pruN mozc-1.5.1090.102.orig/unix/ibus/gen_mozc_xml.py mozc-1.5.1090.102/unix/ibus/gen_mozc_xml.py
---- mozc-1.5.1090.102.orig/unix/ibus/gen_mozc_xml.py	2012-05-28 16:01:42.000000000 +0900
-+++ mozc-1.5.1090.102/unix/ibus/gen_mozc_xml.py	2012-06-05 19:58:00.000000000 +0900
-@@ -73,7 +73,9 @@ IBUS_ENGINES_PROPS = {
-         # unix/ibus/mozc_engine.cc.
+diff -pruN mozc-1.2.855.102.orig/unix/ibus/gen_mozc_xml.py mozc-1.2.855.102/unix/ibus/gen_mozc_xml.py
+--- mozc-1.2.855.102.orig/unix/ibus/gen_mozc_xml.py	2011-10-03 16:10:29.000000000 +0900
++++ mozc-1.2.855.102/unix/ibus/gen_mozc_xml.py	2011-11-15 18:01:44.000000000 +0900
+@@ -74,6 +74,8 @@ IBUS_ENGINES_PROPS = {
          'name': ['mozc-jp'],
          'longname': ['%s'],
--        'layout': ['jp'],
-+        'layout': ['default'],
+         'layout': ['jp'],
 +        'hotkeys': ['Control+space,Zenkaku_Hankaku'],
 +        'symbol': ['&#x3042;'],
      },
diff --git a/mozc.spec b/mozc.spec
index b3622ba..866635e 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -261,8 +261,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jun  5 2012 Akira TAGOH <tagoh at redhat.com> - 1.5.1090.102-1
 - New upstream release. (#828202)
 - Update zipcode dictionaries.
-- set "default" to the layout in mozc.xml to avoid adding jp keyboard layout
-  unexpectedly.
 
 * Thu Apr 26 2012 Akira TAGOH <tagoh at redhat.com> - 1.5.1053.102-1
 - New upstream release. (#816526)