[mozc] - Update to 0.13.481.102. - Add emacs-common-mozc, emacs-mozc, emacs-mozc-el, xemacs-mozc and xemacs

Akira TAGOH tagoh at fedoraproject.org
Mon Sep 27 10:32:51 UTC 2010


commit 74395542f9c0a20317cf4cecce5cf38eb838a921
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Sep 27 19:32:50 2010 +0900

    - Update to 0.13.481.102.
    - Add emacs-common-mozc, emacs-mozc, emacs-mozc-el, xemacs-mozc and xemacs-mozc-el subpackage.

 mozc.spec |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 105 insertions(+), 15 deletions(-)
---
diff --git a/mozc.spec b/mozc.spec
index d4b7b04..d22a0ac 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -4,7 +4,7 @@
 Name:		mozc
 Version:	0.13.481.102
 Release:	0.1.%{archivedate}svn%{?dist}
-Summary:	Opensourced Google Japanese Input
+Summary:	Open-sourced Google Japanese Input
 
 Group:		System Environment/Libraries
 License:	BSD and ASL 2.0 and UCD and Public Domain and Boost and mecab-ipadic
@@ -43,13 +43,14 @@ BuildRequires:	gyp >= 0.1-0.4.840svn
 BuildRequires:	ibus-devel
 BuildRequires:	scim-devel
 BuildRequires:	emacs
+BuildRequires:	xemacs xemacs-packages-extra
 
 %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:	Opensourced Google Japanese Input engine for IBus input platform
+Summary:	Open-sourced Google Japanese Input engine for IBus input platform
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	ibus
@@ -61,7 +62,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:	Opensourced Google Japanese Input engine for SCIM input platform
+Summary:	Open-sourced Google Japanese Input engine for SCIM input platform
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	scim
@@ -72,17 +73,72 @@ multi-platform such as Chromium OS, Windows, Mac and Linux.
 
 This package contains the Input Method Engine for SCIM.
 
+%package	-n emacs-common-mozc
+Summary:	Open-sourced Google Japanese Input for Emacsen
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description	-n emacs-common-mozc
+Mozc is a Japanese Input Method Editor (IME) designed for
+multi-platform such as Chromium OS, Windows, Mac and Linux.
+
+This package contains the files common to both the GNU Emacs
+and XEmacs mozc packages.
+
 %package	-n emacs-mozc
-Summary:	Opensourced Google Japanese Input for GNU Emacs
+Summary:	Compiled elisp files to run mozc under GNU Emacs
 Group:		System Environment/Libraries
 Requires:	emacs(bin) >= %{_emacs_version}
-Requires:	%{name} = %{version}-%{release}
+Requires:	emacs-common-mozc = %{version}-%{release}
+BuildArch:	noarch
 
 %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.
+This package contains the byte compiled elisp files to run mozc with GNU Emacs.
+
+%package	-n emacs-mozc-el
+Summary:	Elisp source files for mozc under GNU Emacs
+Group:		System Environment/Libraries
+Requires:	emacs-mozc = %{version}-%{release}
+BuildArch:	noarch
+
+%description	-n emacs-mozc-el
+Mozc is a Japanese Input Method Editor (IME) designed for
+multi-platform such as Chromium OS, Windows, Mac and Linux.
+
+This package contains the elisp source files for mozc under GNU Emacs. You
+do not need to install this package to run mozc. Install the emacs-mozc package
+to use mozc with GNU Emacs.
+
+%package	-n xemacs-mozc
+Summary:	Compiled elisp files to run mozc under XEmacs
+Group:		System Environment/Libraries
+Requires:	xemacs(bin) >= %{_xemacs_version}
+Requires:	xemacs-packages-extra
+Requires:	emacs-common-mozc = %{version}-%{release}
+BuildArch:	noarch
+
+%description	-n xemacs-mozc
+Mozc is a Japanese Input Method Editor (IME) designed for
+multi-platform such as Chromium OS, Windows, Mac and Linux.
+
+This package contains the byte compiled elisp files to run mozc with XEmacs.
+
+%package	-n xemacs-mozc-el
+Summary:	Elisp source files for mozc under XEmacs
+Group:		System Environment/Libraries
+Requires:	xemacs-mozc = %{version}-%{release}
+BuildArch:	noarch
+
+%description	-n xemacs-mozc-el
+Mozc is a Japanese Input Method Editor (IME) designed for
+multi-platform such as Chromium OS, Windows, Mac and Linux.
+
+This package contains the elisp source files for mozc under XEmacs. You
+do not need to install this package to run mozc. Install the xemacs-mozc package
+to use mozc with XEmacs.
 
 %prep
 %setup -q -c -n %{name}-%{version}
@@ -100,10 +156,13 @@ python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/scim/sci
 
 %install
 install -d $RPM_BUILD_ROOT%{_libexecdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/ibus/component
-install -d $RPM_BUILD_ROOT%{_datadir}/ibus-mozc
 install -p -m0755 out_linux/Release/mozc_server $RPM_BUILD_ROOT%{_libexecdir}
 install -p -m0755 out_linux/Release/mozc_tool $RPM_BUILD_ROOT%{_libexecdir}
+cp -a third_party/rx/v1_0rc2/README third_party/rx/v1_0rc2/README.rx
+
+# ibus-mozc
+install -d $RPM_BUILD_ROOT%{_datadir}/ibus/component
+install -d $RPM_BUILD_ROOT%{_datadir}/ibus-mozc
 install -p -m0755 out_linux/Release/ibus_mozc $RPM_BUILD_ROOT%{_libexecdir}/ibus-engine-mozc
 install -p -m0644 out_linux/Release/obj/gen/unix/ibus/mozc.xml $RPM_BUILD_ROOT%{_datadir}/ibus/component/
 (cd data/images/unix;
@@ -111,6 +170,7 @@ install -p -m0644 ime_product_icon_opensource-32.png $RPM_BUILD_ROOT%{_datadir}/
 for i in ui-*.png; do
 	install -p -m0644 $i $RPM_BUILD_ROOT%{_datadir}/ibus-mozc/${i//ui-/}
 done)
+
 # scim-mozc
 scim_moddir=$(pkg-config --variable=moduledir scim)
 scim_icondir=$(pkg-config --variable=icondir scim)
@@ -124,15 +184,26 @@ 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
+
+# emacs-common-mozc
 install -d $RPM_BUILD_ROOT%{_bindir}
+install -p -m0755 out_linux/Release/mozc_emacs_helper $RPM_BUILD_ROOT%{_bindir}
+
+# emacs-mozc*
 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
+emacs -batch -f batch-byte-compile $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}/mozc.el
+
+# xemacs-mozc*
+install -d $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}
+install -d $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+install -p -m0644 unix/emacs/mozc.el $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}
+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
@@ -144,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/mozc_server
 %{_libexecdir}/mozc_tool
 
-%files -n ibus-mozc
+%files	-n ibus-mozc
 %defattr(-,root,root,-)
 %doc data/installer/credits_en.html
 %lang(ja) %doc data/installer/credits_ja.html
@@ -153,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/mozc.xml
 %{_datadir}/ibus-mozc/*.png
 
-%files -n scim-mozc
+%files	-n scim-mozc
 %defattr(-,root,root,-)
 %doc data/installer/credits_en.html
 %lang(ja) %doc data/installer/credits_ja.html
@@ -161,17 +232,36 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/scim-1.0/*/SetupUI/mozc-setup.so
 %{_datadir}/scim/icons/*.png
 
-%files	-n emacs-mozc
+%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
 * 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.
+- Add emacs-common-mozc, emacs-mozc, emacs-mozc-el, xemacs-mozc and xemacs-mozc-el subpackage.
 
 * Fri Sep 10 2010 Akira TAGOH <tagoh at redhat.com> - 0.13.464.102-0.1.20100910svn
 - Update to 0.13.464.102.


More information about the scm-commits mailing list