mozc: update to 2.17.2077.102

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

m/mozc/mozc-vl.spec

@@ -1,4 +1,4 @@
-%define		ver	1.13.1651.102
+%define		ver	2.17.2077.102
 %define		rel	1
 
 # if you want to make scim-mozc package, rpm --define with_scim:1
@@ -18,7 +18,9 @@ Group:		System Environment/Libraries
 License:	BSD-like
 URL:		http://code.google.com/p/mozc/
 
-Source0:	http://mozc.googlecode.com/files/%{name}-%{version}.tar.bz2
+#Source0:	http://mozc.googlecode.com/files/%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}.tar.bz2
+
 ## svn debian/copyright
 Source1:	mozc-copyright
 # for mozc-el
@@ -29,12 +31,18 @@ Source5:	%{name}-init.el
 
 #Source6:	protobuf-2.5.0-r497.tar.bz2
 
+# build patch
+Patch1:         mozc-build-gcc.patch
+Patch2:         mozc-build-verbosely.patch
+
+Patch5:		mozc-build-pthread.patch
+
 # Vine Lunux
 Source10:	README.vine
 Patch10:	mozc-1.10.1390.102-ibus-japanese.patch
 
 # fcitx-mozc
-Patch15:	fcitx-mozc-1.12.1599.102.1.patch
+Patch15:	fcitx-mozc-2.17.2313.102.1.patch
 Source15:	fcitx-mozc-icon.tar.gz
 
 # japanpost
@@ -42,7 +50,7 @@ Source20: http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
 Source21: http://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	python, ibus-devel, dbus-devel
+BuildRequires:	python, python-devel, ibus-devel, dbus-devel
 BuildRequires:	openssl-devel, zlib-devel
 BuildRequires:	curl-devel
 BuildRequires:	gtest-devel
@@ -51,6 +59,7 @@ BuildRequires:  gyp
 BuildRequires:	pkgconfig
 BuildRequires:  gtk2-devel
 BuildRequires:  protobuf-devel
+BuildRequires:  ninja >= 1.6.0
 %if %{with_scim}
 # for scim-mozc
 BuildRequires:  scim-devel
@@ -165,7 +174,11 @@ Emacs Lisp frontend for Mozc
 Mozc のための Emacs-lisp フロントエンド
 
 %prep
-%setup -q -a 20 -a 21 -a 15
+%setup -q -c -n %{name}-%{version} -a 20 -a 21 -a 15
+
+%patch1 -p1 -b .gcc
+%patch2 -p1 -b .verbose
+%patch5 -p1 -b .remove-pthread
 
 %patch10 -p1 -b .japanese
 %{__cp} -p %{SOURCE1} COPYING
@@ -181,6 +194,16 @@ Mozc のための Emacs-lisp フロントエンド
 
 
 %build
+# replace compiler flags to build with the proper debugging information
+t=$(mktemp /tmp/mozc.gyp-XXXXXXXX)
+opts=$(for i in $RPM_OPT_FLAGS; do
+        echo "i \\"
+        echo "\"$i\","
+done)
+sed -ne "/'linux_cflags':/{p;n;p;:a;/[[:space:]]*\],/{\
+$opts
+p;b b};n;b a;};{p};:b" gyp/common.gypi > $t && mv $t gyp/common.gypi || exit 1
+
 unset QTDIR
 GYP_DEFINES="use_libprotobuf=1
              zinnia_model_file=/usr/share/zinnia/model/tomoe/handwriting-ja.model
@@ -190,7 +213,6 @@ GYP_DEFINES="use_libprotobuf=1
   --gypdir=%{_bindir} \
   --server_dir=%{_libexecdir}
 
-%{__python} build_mozc.py build_tools -c Release
 %{__python} build_mozc.py build -c Release \
 	    unix/ibus/ibus.gyp:ibus_mozc \
 %if %{with_scim}
@@ -215,7 +237,7 @@ GYP_DEFINES="use_libprotobuf=1
 # ibus-mozc
 %{__cp} -p %{output_dir}/ibus_mozc %{buildroot}%{_libexecdir}/ibus-engine-mozc
 %{__mkdir_p} %{buildroot}%{_datadir}/ibus/component/
-%{__cp} -p %{output_dir}/obj/gen/unix/ibus/mozc.xml %{buildroot}%{_datadir}/ibus/component/
+%{__cp} -p %{output_dir}/gen/unix/ibus/mozc.xml %{buildroot}%{_datadir}/ibus/component/
 ## install icons
 %{__mkdir_p} %{buildroot}%{_datadir}/ibus-mozc/setup
 (cd data/images/unix;
@@ -249,7 +271,7 @@ done)
 %{__cp} -p unix/fcitx/fcitx-mozc.conf %{buildroot}%{_datadir}/fcitx/addon/
 %{__mkdir_p} %{buildroot}%{_datadir}/fcitx/inputmethod/
 %{__cp} -p unix/fcitx/mozc.conf %{buildroot}%{_datadir}/fcitx/inputmethod/
-(cd %{output_dir}/obj/gen/unix/fcitx/po;
+(cd %{output_dir}/gen/unix/fcitx/po;
 for i in *.mo; do
   %{__mkdir_p} %{buildroot}%{_localedir}/${i/.mo/}/ ;
   %{__cp} -p $i %{buildroot}%{_localedir}/${i/.mo/}/fcitx-mozc.mo
@@ -364,6 +386,14 @@ fi
 
 
 %changelog
+* Mon Jan 18 2016 Daisuke SUZUKI <daisuke@vinelinux.org> 2.17.2077.102-1
+- update to 2.17.2077.102
+- update mozc-fcitx
+- add BR: ninja >= 1.6.0
+
+* Thu Aug 28 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.15.1870.102-1
+- update to 1.15.1870.102
+
 * Tue Jun 03 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.13.1651.102-1
 - update to 1.13.1651.102