[mozc] New upstream release.

[Akira TAGOH]

commit f139a01e8a163531d31b37973b1fc8ca5bc5dbfe
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Jul 4 16:38:26 2011 +0900

    New upstream release.

 .gitignore                  |    1 +
 mozc-fix-sign-compare.patch | 1109 -------------------------------------------
 mozc-fix-unused-val.patch   |   38 --
 mozc-hotkeys.patch          |   11 +
 mozc-no-Werror.patch        |   11 +
 mozc.spec                   |   19 +-
 sources                     |    2 +-
 7 files changed, 35 insertions(+), 1156 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0aa9d28..23c7728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /mozc-1.1.626.102-20110301.tar.bz2
 /mozc-1.1.690.102-20110419.tar.bz2
 /mozc-1.1.717.102.tar.bz2
+/mozc-1.1.758.102.tar.bz2
diff --git a/mozc-hotkeys.patch b/mozc-hotkeys.patch
new file mode 100644
index 0000000..405f480
--- /dev/null
+++ b/mozc-hotkeys.patch
@@ -0,0 +1,11 @@
+diff -pruN mozc-1.1.758.102.orig/unix/ibus/gen_mozc_xml.py mozc-1.1.758.102/unix/ibus/gen_mozc_xml.py
+--- mozc-1.1.758.102.orig/unix/ibus/gen_mozc_xml.py	2011-07-01 10:54:49.000000000 +0900
++++ mozc-1.1.758.102/unix/ibus/gen_mozc_xml.py	2011-07-04 16:33:00.916083629 +0900
+@@ -74,6 +74,7 @@ IBUS_ENGINES_PROPS = {
+         'name': ['mozc-jp'],
+         'longname': ['%s'],
+         'layout': ['jp'],
++	'hotkeys': ['Control+space,Zenkaku_Hankaku'],
+     },
+     # On Chrome/Chromium OS, we provide three engines.
+     'ChromeOS': {
diff --git a/mozc-no-Werror.patch b/mozc-no-Werror.patch
new file mode 100644
index 0000000..c89428d
--- /dev/null
+++ b/mozc-no-Werror.patch
@@ -0,0 +1,11 @@
+diff -pruN mozc-1.1.717.102.orig/gyp/common.gypi mozc-1.1.717.102/gyp/common.gypi
+--- mozc-1.1.717.102.orig/gyp/common.gypi	2011-05-20 17:17:02.000000000 +0900
++++ mozc-1.1.717.102/gyp/common.gypi	2011-06-01 17:18:57.000000000 +0900
+@@ -50,7 +50,6 @@
+     # warning_cflags will be shared with Mac and Linux.
+     'warning_cflags': [
+       '-Wall',
+-      '-Werror',
+       '-Wno-char-subscripts',
+       '-Wno-sign-compare',
+       '-Wno-deprecated-declarations',
diff --git a/mozc.spec b/mozc.spec
index 1aaab5c..5014685 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -1,8 +1,8 @@
 %define		pkg	mozc
 
 Name:		mozc
-Version:	1.1.717.102
-Release:	3%{?dist}
+Version:	1.1.758.102
+Release:	1%{?dist}
 Summary:	Open-sourced Google Japanese Input
 
 Group:		System Environment/Libraries
@@ -21,9 +21,9 @@ Source0:	http://mozc.googlecode.com/files/mozc-%{version}.tar.bz2
 Source1:	mozc-init.el
 Patch0:		mozc-build-verbosely.patch
 Patch1:		mozc-fix-model-path-for-zinnia.patch
-Patch2:		mozc-fix-unused-val.patch
-Patch3:		mozc-fix-array-bounds.patch
-Patch4:		mozc-fix-sign-compare.patch
+Patch2:		mozc-fix-array-bounds.patch
+Patch3:		mozc-no-Werror.patch
+Patch4:		mozc-hotkeys.patch
 
 BuildRequires:	python gettext
 BuildRequires:	openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel glib2-devel qt-devel zinnia-devel
@@ -134,9 +134,9 @@ to use mozc with XEmacs.
 %setup -q
 %patch0 -p1 -b .0-build-verbosely
 %patch1 -p1 -b .1-fix-zinnia
-%patch2 -p1 -b .2-unused-val
-%patch3 -p1 -b .3-array-bounds
-%patch4 -p1 -b .4-sign-compare
+%patch2 -p1 -b .2-array-bounds
+%patch3 -p1 -b .3-no-Werror
+%patch4 -p1 -b .4-hotkeys
 
 
 %build
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Mon Jul  4 2011 Akira TAGOH <tagoh at redhat.com> - 1.1.758.102-1
+- New upstream release.
+
 * Mon Jun 13 2011 Akira TAGOH <tagoh at redhat.com> - 1.1.717.102-3
 - Rebuild against new protobuf.
 
diff --git a/sources b/sources
index c12bee9..2aefe64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b6feee8162f95e3309767ae340c42a5  mozc-1.1.717.102.tar.bz2
+0ba49437981669827c37c7af73bdf8a2  mozc-1.1.758.102.tar.bz2