[mozc] New upstream release. (#928711)

[Akira TAGOH]

commit c1155062a7cfca94cc85d47752e3842dac1ef2fe
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Mar 28 19:58:42 2013 +0900

    New upstream release. (#928711)
    
    - Improve the spec file (#891078)

 .gitignore                  |    1 +
 mozc-ibus-prop.patch        |  145 -------------------------------------------
 mozc-support-new-ibus.patch |   23 -------
 mozc.spec                   |   35 ++++-------
 sources                     |    2 +-
 5 files changed, 14 insertions(+), 192 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0f77e3..749d456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ clog
 /mozc-1.5.1053.102.tar.bz2
 /mozc-1.5.1090.102.tar.bz2
 /mozc-1.6.1187.102.tar.bz2
+/mozc-1.10.1389.102.tar.bz2
diff --git a/mozc.spec b/mozc.spec
index 1933074..e50c145 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -1,15 +1,13 @@
 %define		pkg	mozc
 
 Name:		mozc
-Version:	1.6.1187.102
-Release:	4%{?dist}
-Summary:	Open-sourced Google Japanese Input
+Version:	1.10.1389.102
+Release:	1%{?dist}
+Summary:	A Japanese Input Method Editor (IME) designed for multi-platform
 
 Group:		System Environment/Libraries
 License:	BSD and ASL 2.0 and UCD and Public Domain and mecab-ipadic
 URL:		http://code.google.com/p/mozc
-# third_party/rx/rx.c: ASL 2.0
-#  Copyright Yusuke Tabata 2008
 # data/unicode/: UCD
 #  Copyright (c) 1991-2008 Unicode, Inc.
 # data/test/stress_test/sentences.txt: Public Domain
@@ -25,9 +23,7 @@ Source4:	ibus-setup-mozc-jp.desktop
 Patch0:		mozc-build-verbosely.patch
 Patch1:		mozc-fix-model-path-for-zinnia.patch
 Patch2:		mozc-no-Werror.patch
-Patch3:		mozc-support-new-ibus.patch
 Patch4:		mozc-fix-dirs.patch
-Patch5:		mozc-ibus-prop.patch
 
 BuildRequires:	python gettext
 BuildRequires:	openssl-devel libstdc++-devel zlib-devel libxcb-devel protobuf-devel glib2-devel qt-devel zinnia-devel gtk2-devel
@@ -43,10 +39,10 @@ Mozc is a Japanese Input Method Editor (IME) designed for
 multi-platform such as Chromium OS, Windows, Mac and Linux.
 
 %package	-n ibus-mozc
-Summary:	A Japanese Input Method Editor (IME) designed for multi-platform
+Summary:	The mozc engine for IBus input platform
 Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	ibus
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	ibus%{?_isa}
 
 %description	-n ibus-mozc
 Mozc is a Japanese Input Method Editor (IME) designed for
@@ -55,9 +51,9 @@ multi-platform such as Chromium OS, Windows, Mac and Linux.
 This package contains the Input Method Engine for IBus.
 
 %package	-n emacs-common-mozc
-Summary:	Open-sourced Google Japanese Input for Emacsen
+Summary:	Common files to run mozc under Emacsen
 Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description	-n emacs-common-mozc
 Mozc is a Japanese Input Method Editor (IME) designed for
@@ -126,9 +122,7 @@ to use mozc with XEmacs.
 %patch0 -p1 -b .0-build-verbosely
 %patch1 -p1 -b .1-fix-zinnia
 %patch2 -p1 -b .2-no-Werror
-%patch3 -p1 -b .3-new-ibus
 %patch4 -p1 -b .4-dirs
-%patch5 -p0 -b .5-ibus-prop
 (cd data/dictionary_oss;
 python ../../dictionary/gen_zip_code_seed.py --zip_code=../../KEN_ALL.CSV --jigyosyo=../../JIGYOSYO.CSV >> dictionary09.txt;
 )
@@ -179,18 +173,14 @@ install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 
 xemacs -batch -f batch-byte-compile $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}/mozc.el
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc third_party/rx/v1_1_2/README.rx data/installer/credits_en.html
 %lang(ja) %doc data/installer/credits_ja.html
 %{_libexecdir}/mozc_server
 %{_libexecdir}/mozc_tool
 
 %files	-n ibus-mozc
-%defattr(-,root,root,-)
 %doc data/installer/credits_en.html
 %lang(ja) %doc data/installer/credits_ja.html
 %dir %{_datadir}/ibus-mozc
@@ -201,32 +191,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus-mozc/*.png
 
 %files	-n emacs-common-mozc
-%defattr(-,root,root,-)
 %doc data/installer/credits_en.html
 %lang(ja) %doc data/installer/credits_ja.html
 %{_bindir}/mozc_emacs_helper
 
 %files	-n emacs-mozc
-%defattr(-,root,root,-)
 %dir %{_emacs_sitelispdir}/%{pkg}
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 
 %files	-n emacs-mozc-el
-%defattr(-,root,root,-)
 %{_emacs_sitelispdir}/%{pkg}/*.el
 
 %files	-n xemacs-mozc
-%defattr(-,root,root,-)
 %dir %{_xemacs_sitelispdir}/%{pkg}
 %{_xemacs_sitelispdir}/%{pkg}/*.elc
 %{_xemacs_sitestartdir}/*.el
 
 %files	-n xemacs-mozc-el
-%defattr(-,root,root,-)
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Thu Mar 28 2013 Akira TAGOH <tagoh at redhat.com> - 1.10.1389.102-1
+- New upstream release. (#928711)
+- Improve the spec file (#891078)
+
 * Wed Mar 13 2013 Akira TAGOH <tagoh at redhat.com> - 1.6.1187.102-4
 - Apply an upstream patch to fix a text property for menus (#920122)
 - Update zipcode dictionaries.
diff --git a/sources b/sources
index ed0f6ed..751586c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-e5246d17a81d2e942e9e8de0c3240c95  mozc-1.6.1187.102.tar.bz2
 0ce9bd1663e320dc63bd2afffc475ab9  ken_all.zip
 e2a4bdf2d1384b124492a175d35b7867  jigyosyo.zip
+809c984e0198b790d8d662d75168b477  mozc-1.10.1389.102.tar.bz2