mozc: update to 1.10.1390.102, use internal protobuf

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7610 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mozc/mozc-vl.spec

@@ -1,4 +1,4 @@
-%define		ver	1.6.1187.102
+%define		ver	1.10.1390.102
 %define		rel	1
 
 # if you want to make scim-mozc package, rpm --define with_scim:1
@@ -27,13 +27,13 @@ Source3:	%{name}-remove.sh
 Source4:	vine-default-%{name}.el
 Source5:	%{name}-init.el
 
-# support new ibus
-Patch3:         mozc-support-new-ibus.patch
+Source6:	protobuf-2.5.0-r497.tar.bz2
 
+Patch2:         mozc-no-Werror.patch
 
 # Vine Lunux
 Source10:	README.vine
-Patch10:	mozc-1.6.1187.102-ibus-japanese.patch
+Patch10:	mozc-1.10.1390.102-ibus-japanese.patch
 
 # japanpost
 Source20: http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
@@ -43,7 +43,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	python, ibus-devel, dbus-devel
 BuildRequires:	openssl-devel, zlib-devel
 BuildRequires:	curl-devel
-BuildRequires:	protobuf-devel, gtest-devel
+BuildRequires:	gtest-devel
 BuildRequires:	qt4-devel
 BuildRequires:  gyp
 BuildRequires:	pkgconfig
@@ -145,8 +145,10 @@ Emacs Lisp frontend for Mozc
 Mozc のための Emacs-lisp フロントエンド
 
 %prep
-%setup -q -a 20 -a 21
-%patch3 -p1 -b .new-ibus
+%setup -q -a 6 -a 20 -a 21
+
+%patch2 -p1 -b .2-no-Werror
+
 %patch10 -p1 -b .japanese
 %{__cp} -p %{SOURCE1} COPYING
 (cd data/dictionary_oss;
@@ -154,12 +156,11 @@ Mozc のための Emacs-lisp フロントエンド
 )
 
 # update execute files path
-%{__sed} -i -e"s|/usr/lib/mozc|%{_libexecdir}|g" base/util.cc
+%{__sed} -i -e "s|/usr/lib/mozc|%{_libexecdir}|g" base/const.h
 
 
 %build
 unset QTDIR
-GYP_DEFINES="use_libprotobuf=1" \
 %{__python} build_mozc.py gyp \
   --gypdir=%{_bindir} \
   --server_dir=%{_libexecdir}
@@ -311,6 +312,10 @@ fi
 
 
 %changelog
+* Sun Apr 07 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.10.1390.102-1
+- new upstream release
+- use internal protobuf (add Source10)
+
 * Fri Oct 12 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6.1187.102-1
 - new upstream release