[mozc] New upstream release.

[Akira TAGOH]

commit 3bf292aafc8b8791b3cc5142253aa4a05b07e422
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Mar 8 10:36:00 2012 +0900

    New upstream release.
    
    - Update zipcode dictionaries.

 .gitignore                |    1 +
 mozc-fix-build-fail.patch |   10 --------
 mozc-fix-dirs.patch       |    9 -------
 mozc-ibus141.patch        |   52 ---------------------------------------------
 mozc.spec                 |   13 ++++++-----
 sources                   |    6 ++--
 6 files changed, 11 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1412a5c..7f8565b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ clog
 /mozc-1.3.911.102.tar.bz2
 /mozc-1.3.930.102.tar.bz2
 /mozc-1.3.975.102.tar.bz2
+/mozc-1.4.1003.102.tar.bz2
diff --git a/mozc-fix-build-fail.patch b/mozc-fix-build-fail.patch
index 0d4c91e..4bbf7e8 100644
--- a/mozc-fix-build-fail.patch
+++ b/mozc-fix-build-fail.patch
@@ -9,14 +9,4 @@ diff -pruN mozc-1.3.975.102.orig/gui/base/singleton_window_helper.cc mozc-1.3.97
  #include "base/base.h"
  #include "base/file_stream.h"
  #include "base/mutex.h"
-diff -pruN mozc-1.3.975.102.orig/storage/lru_cache.h mozc-1.3.975.102/storage/lru_cache.h
---- mozc-1.3.975.102.orig/storage/lru_cache.h	2012-01-26 18:15:23.000000000 +0900
-+++ mozc-1.3.975.102/storage/lru_cache.h	2012-02-13 13:32:11.000000000 +0900
-@@ -33,6 +33,7 @@
- #include <map>
- #include <list>
- #include <string>
-+#include <cstring>
- 
- #include "base/base.h"
  
diff --git a/mozc-fix-dirs.patch b/mozc-fix-dirs.patch
index eb10770..c49d14f 100644
--- a/mozc-fix-dirs.patch
+++ b/mozc-fix-dirs.patch
@@ -9,15 +9,6 @@ diff -pruN mozc-1.3.975.102.orig/base/util.cc mozc-1.3.975.102/base/util.cc
  
  
  namespace {
-@@ -2637,7 +2638,7 @@ string Util::GetServerDirectory() {
- #endif  // OS_MACOSX
- 
- #ifdef OS_LINUX
--  return "/usr/lib/mozc";
-+  return "/usr/libexec";
- #endif  // OS_LINUX
- }
- 
 @@ -2645,7 +2646,7 @@ string Util::GetDocumentDirectory() {
  #ifdef OS_MACOSX
    return Util::GetServerDirectory();
diff --git a/mozc.spec b/mozc.spec
index db20354..81d460d 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -1,8 +1,8 @@
 %define		pkg	mozc
 
 Name:		mozc
-Version:	1.3.975.102
-Release:	3%{?dist}
+Version:	1.4.1003.102
+Release:	1%{?dist}
 Summary:	Open-sourced Google Japanese Input
 
 Group:		System Environment/Libraries
@@ -28,7 +28,6 @@ Patch2:		mozc-no-Werror.patch
 Patch3:		mozc-support-new-ibus.patch
 Patch4:		mozc-fix-dirs.patch
 Patch5:		mozc-fix-build-fail.patch
-Patch6:		mozc-ibus141.patch
 
 BuildRequires:	python gettext
 BuildRequires:	openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel glib2-devel qt-devel zinnia-devel
@@ -143,7 +142,6 @@ to use mozc with XEmacs.
 %patch3 -p1 -b .3-new-ibus
 %patch4 -p1 -b .4-dirs
 %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;
 )
@@ -152,8 +150,7 @@ python ../../dictionary/gen_zip_code_seed.py --zip_code=../../KEN_ALL.CSV --jigy
 %build
 sed -i	-e "s|\(.*\)/usr/lib/\(glib-2.0/.*\)|\1%{_libdir}/\2|g" \
 	-e "s|\(.*\)/usr/lib/\(gtk-2.0/.*\)|\1%{_libdir}/\2|g" unix/scim/scim.gyp
-sed -i -e "s|/usr/lib/mozc|%{_libexecdir}|g" base/util.cc
-python build_mozc.py gyp --gypdir=%{_bindir}
+python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir} --use_libprotobuf
 python build_mozc.py build_tools -c Release
 python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool
 
@@ -263,6 +260,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Mar  8 2012 Akira TAGOH <tagoh at redhat.com> - 1.4.1003.102-1
+- New upstream release.
+- Update zipcode dictionaries.
+
 * Wed Mar  7 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.975.102-3
 - Rebuild for ibus 1.4.99.20120304
 
diff --git a/sources b/sources
index 242033d..92a4a4a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0c746a97285dadf499eacd23facd93a9  mozc-1.3.975.102.tar.bz2
-f61737ace016f941cb9c8dde736cd547  jigyosyo.zip
-1d33f327a3644581b4aeadd7ac517037  ken_all.zip
+09bd13610282f81c2fced629ebad5b02  mozc-1.4.1003.102.tar.bz2
+99e1dbb3ee43b0f3ed4d322e1be2052e  ken_all.zip
+fea6996733ddde417f72ee92c6b4ba85  jigyosyo.zip