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

[Akira TAGOH]

commit 32dc4ba5d0d1fe9d48c16123ddb720ace3cbde8d
Merge: 2f5ca7a 754a804
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Feb 13 16:17:18 2012 +0900

    Merge remote-tracking branch 'origin/f16' into f15
    
    Conflicts:
    	mozc.spec

 .gitignore                |    1 +
 mozc-fix-build-fail.patch |   22 +++++++++++++++++++
 mozc-ibus141.patch        |   52 +++++++++++++++++++++++++++++++++++++++++++++
 mozc-serverdir.patch      |   12 ++++++++++
 mozc.spec                 |   15 ++++++++++++-
 sources                   |    6 ++--
 6 files changed, 104 insertions(+), 4 deletions(-)
---
diff --cc mozc.spec
index 87eb557,88444a2..9ad7831
--- a/mozc.spec
+++ b/mozc.spec
@@@ -137,7 -140,10 +140,10 @@@ 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
 +#%%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;
  )