[mozc/f15: 3/3] Merge remote-tracking branch 'origin/f16' into f15

[Akira TAGOH]

commit ef5388324043eec2a1d5f88bd4a6cf7ef61e6812
Merge: e2375fb 3bf292a
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Mar 8 12:15:08 2012 +0900

    Merge remote-tracking branch 'origin/f16' into f15

 .gitignore                |    1 +
 mozc-fix-build-fail.patch |   10 --------
 mozc-fix-dirs.patch       |    9 -------
 mozc-ibus141.patch        |   52 ---------------------------------------------
 mozc.spec                 |   16 ++++++++-----
 sources                   |    6 ++--
 6 files changed, 14 insertions(+), 80 deletions(-)
---
diff --cc mozc.spec
index a0078c5,81d460d..9d72852
--- a/mozc.spec
+++ b/mozc.spec
@@@ -140,10 -139,9 +139,9 @@@ to use mozc with XEmacs
  %patch0 -p1 -b .0-build-verbosely
  %patch1 -p1 -b .1-fix-zinnia
  %patch2 -p1 -b .2-no-Werror
 -%patch3 -p1 -b .3-new-ibus
 -%patch4 -p1 -b .4-dirs
 +#%%patch3 -p1 -b .3-new-ibus
 +%patch4 -p1 -b .4-serverdir
  %patch5 -p1 -b .5-missing-headers
- %patch6 -p0 -b .6-ibus141
  (cd data/dictionary;
  python ../../dictionary/gen_zip_code_seed.py --zip_code=../../KEN_ALL.CSV --jigyosyo=../../JIGYOSYO.CSV >> dictionary09.txt;
  )