diff --git a/.gitignore b/.gitignore index 23c7728..a323873 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /mozc-1.1.690.102-20110419.tar.bz2 /mozc-1.1.717.102.tar.bz2 /mozc-1.1.758.102.tar.bz2 +/mozc-1.1.773.102.tar.bz2 diff --git a/mozc-fix-array-bounds.patch b/mozc-fix-array-bounds.patch deleted file mode 100644 index 134eedf..0000000 --- a/mozc-fix-array-bounds.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN mozc-1.1.717.102.orig/base/util.cc mozc-1.1.717.102/base/util.cc ---- mozc-1.1.717.102.orig/base/util.cc 2011-05-20 17:17:00.000000000 +0900 -+++ mozc-1.1.717.102/base/util.cc 2011-05-23 17:45:42.000000000 +0900 -@@ -620,7 +620,7 @@ void Util::UCS4ToUTF8(char32 c, string * - } - - void Util::UCS4ToUTF8Append(char32 c, string *output) { -- char buf[6]; -+ char buf[7]; - UCS4ToUTF8Internal(c, buf); - *output += buf; - } diff --git a/mozc.spec b/mozc.spec index a7ae66f..3be2a27 100644 --- a/mozc.spec +++ b/mozc.spec @@ -1,8 +1,8 @@ %define pkg mozc Name: mozc -Version: 1.1.758.102 -Release: 2%{?dist} +Version: 1.1.773.102 +Release: 1%{?dist} Summary: Open-sourced Google Japanese Input Group: System Environment/Libraries @@ -21,9 +21,8 @@ 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-array-bounds.patch -Patch3: mozc-no-Werror.patch -Patch4: mozc-hotkeys.patch +Patch2: mozc-no-Werror.patch +Patch3: 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 +133,8 @@ to use mozc with XEmacs. %setup -q %patch0 -p1 -b .0-build-verbosely %patch1 -p1 -b .1-fix-zinnia -%patch2 -p1 -b .2-array-bounds -%patch3 -p1 -b .3-no-Werror -#%%patch4 -p1 -b .4-hotkeys +%patch2 -p1 -b .2-no-Werror +#%%patch3 -p1 -b .3-hotkeys %build @@ -253,7 +251,10 @@ rm -rf $RPM_BUILD_ROOT %{_xemacs_sitelispdir}/%{pkg}/*.el %changelog -* Mon Jul 11 2011 Akira TAGOh - 1.1.758.102-2 +* Thu Jul 21 2011 Akira TAGOH - 1.1.773.102-1 +- New upstream release. + +* Mon Jul 11 2011 Akira TAGOH - 1.1.758.102-2 - Revert hotkeys patch. * Mon Jul 4 2011 Akira TAGOH - 1.1.758.102-1 diff --git a/sources b/sources index 2aefe64..3f5ae7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ba49437981669827c37c7af73bdf8a2 mozc-1.1.758.102.tar.bz2 +f096785b0db4237273ce0111bd12a1c7 mozc-1.1.773.102.tar.bz2