[mozc] - Update to 0.13.481.102.

Akira TAGOH tagoh at fedoraproject.org
Mon Sep 27 09:55:30 UTC 2010


commit 4c6834c42e98905c1be00b88575e940ef5eb9496
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Sep 27 18:55:29 2010 +0900

    - Update to 0.13.481.102.

 .gitignore |    1 +
 mozc.spec  |   43 ++++++++++++++++++++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 40 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 227f28e..818792d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mozc-0.12.434.102-20100823.tar.bz2
 /mozc-0.13.464.102-20100910.tar.bz2
+/mozc-0.13.481.102-20100927.tar.bz2
diff --git a/mozc.spec b/mozc.spec
index 8a225df..d4b7b04 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -1,7 +1,8 @@
-%define		archivedate		20100910
+%define		archivedate		20100927
+%define		pkg			mozc
 
 Name:		mozc
-Version:	0.13.464.102
+Version:	0.13.481.102
 Release:	0.1.%{archivedate}svn%{?dist}
 Summary:	Opensourced Google Japanese Input
 
@@ -33,6 +34,7 @@ URL:		http://code.google.com/p/mozc
 #   See http://code.google.com/p/mozc/issues/detail?id=20
 #   also data/installer/credits_en.html
 Source0:	mozc-%{version}-%{archivedate}.tar.bz2
+Source1:	mozc-init.el
 Patch0:		mozc-build-verbosely.patch
 
 BuildRequires:	python gettext
@@ -40,13 +42,14 @@ BuildRequires:	openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-deve
 BuildRequires:	gyp >= 0.1-0.4.840svn
 BuildRequires:	ibus-devel
 BuildRequires:	scim-devel
+BuildRequires:	emacs
 
 %description
 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:	Google Japanese Input engine for IBus input platform
+Summary:	Opensourced Google Japanese Input engine for IBus input platform
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	ibus
@@ -58,7 +61,7 @@ multi-platform such as Chromium OS, Windows, Mac and Linux.
 This package contains the Input Method Engine for IBus.
 
 %package	-n scim-mozc
-Summary:	Google Japanese Input engine for SCIM input platform
+Summary:	Opensourced Google Japanese Input engine for SCIM input platform
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	scim
@@ -69,6 +72,18 @@ multi-platform such as Chromium OS, Windows, Mac and Linux.
 
 This package contains the Input Method Engine for SCIM.
 
+%package	-n emacs-mozc
+Summary:	Opensourced Google Japanese Input for GNU Emacs
+Group:		System Environment/Libraries
+Requires:	emacs(bin) >= %{_emacs_version}
+Requires:	%{name} = %{version}-%{release}
+
+%description	-n emacs-mozc
+Mozc is a Japanese Input Method Editor (IME) designed for
+multi-platform such as Chromium OS, Windows, Mac and Linux.
+
+This package contains Emacs support for mozc.
+
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p0 -b .0-build-verbosely
@@ -80,7 +95,7 @@ sed -i	-e "s|\(.*\)/usr/lib/\(glib-2.0/.*\)|\1%{_libdir}/\2|g" \
 sed -i -e "s|/usr/lib/mozc|%{_libexecdir}|g" base/util.cc
 python build_mozc.py gyp --gypdir=%{_bindir}
 python build_mozc.py build_tools -c Release
-python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup server/server.gyp:mozc_server gui/gui.gyp:mozc_tool
+python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool
 
 
 %install
@@ -109,6 +124,13 @@ install -p -m0644 ime_product_icon_opensource-32.png $RPM_BUILD_ROOT$scim_icondi
 for i in ui-*.png; do
 	install -p -m0644 $i $RPM_BUILD_ROOT$scim_icondir/${i//ui-/scim-mozc-}
 done)
+# emacs-mozc
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+install -d $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+install -p -m0755 out_linux/Release/mozc_emacs_helper $RPM_BUILD_ROOT%{_bindir}
+install -p -m0644 unix/emacs/mozc.el $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 cp -a third_party/rx/v1_0rc2/README third_party/rx/v1_0rc2/README.rx
 
@@ -139,7 +161,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/scim-1.0/*/SetupUI/mozc-setup.so
 %{_datadir}/scim/icons/*.png
 
+%files	-n emacs-mozc
+%defattr(-,root,root,-)
+%doc data/installer/credits_en.html
+%lang(ja) %doc data/installer/credits_ja.html
+%{_bindir}/mozc_emacs_helper
+%{_emacs_sitelispdir}/%{pkg}/*.el
+
 %changelog
+* Mon Sep 27 2010 Akira TAGOH <tagoh at redhat.com> - 0.13.481.102-0.1.20100927svn
+- Update to 0.13.481.102.
+- Add emacs-mozc subpackage.
+
 * Fri Sep 10 2010 Akira TAGOH <tagoh at redhat.com> - 0.13.464.102-0.1.20100910svn
 - Update to 0.13.464.102.
 
diff --git a/sources b/sources
index c32596e..573dbcb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e52c07bacbc1dad89ec6e79b3f9328e7  mozc-0.13.464.102-20100910.tar.bz2
+a452a7810c0a33cda2d3df29f5739fae  mozc-0.13.481.102-20100927.tar.bz2


More information about the scm-commits mailing list