[mozc] no SCIM support anymore

Akira TAGOH tagoh at fedoraproject.org
Fri Aug 31 10:28:50 UTC 2012


commit c90a18738bf2a2a89554bd001b5d408c6c193319
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Aug 31 19:28:44 2012 +0900

    no SCIM support anymore

 mozc.spec |   42 +++---------------------------------------
 1 files changed, 3 insertions(+), 39 deletions(-)
---
diff --git a/mozc.spec b/mozc.spec
index e55829b..5c5f49e 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -32,7 +32,6 @@ BuildRequires:	python gettext
 BuildRequires:	openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel glib2-devel qt-devel zinnia-devel
 BuildRequires:	gyp >= 0.1-0.4.840svn
 BuildRequires:	ibus-devel >= 1.3.99
-BuildRequires:	scim-devel
 BuildRequires:	emacs
 BuildRequires:	xemacs xemacs-packages-extra
 
@@ -54,18 +53,6 @@ multi-platform such as Chromium OS, Windows, Mac and Linux.
 
 This package contains the Input Method Engine for IBus.
 
-%package	-n scim-mozc
-Summary:	Open-sourced Google Japanese Input engine for SCIM input platform
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	scim
-
-%description	-n scim-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 Input Method Engine for SCIM.
-
 %package	-n emacs-common-mozc
 Summary:	Open-sourced Google Japanese Input for Emacsen
 Group:		System Environment/Libraries
@@ -146,11 +133,9 @@ python ../../dictionary/gen_zip_code_seed.py --zip_code=../../KEN_ALL.CSV --jigy
 
 
 %build
-sed -i	-e "s|\(.*\)/usr/lib/\(glib-2.0/.*\)|\1%{_libdir}/\2|g" \
-	-e "s|\(.*\)/usr/lib/\(gtk-2.0/.*\)|\1%{_libdir}/\2|g" unix/scim/scim.gyp
-python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir} --use_libprotobuf
+GYP_DEFINES="use_libprotobuf=1" python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir}
 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 unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer
+python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer
 
 
 %install
@@ -171,20 +156,6 @@ 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)
-install -d $RPM_BUILD_ROOT$scim_moddir/IMEngine
-install -d $RPM_BUILD_ROOT$scim_moddir/SetupUI
-install -d $RPM_BUILD_ROOT$scim_icondir
-install -p -m0755 out_linux/Release/lib.target/libscim_mozc.so $RPM_BUILD_ROOT$scim_moddir/IMEngine/mozc.so
-install -p -m0755 out_linux/Release/lib.target/libscim_mozc_setup.so $RPM_BUILD_ROOT$scim_moddir/SetupUI/mozc-setup.so
-(cd data/images/unix;
-install -p -m0644 ime_product_icon_opensource-32.png $RPM_BUILD_ROOT$scim_icondir/scim-mozc.png
-for i in ui-*.png; do
-	install -p -m0644 $i $RPM_BUILD_ROOT$scim_icondir/${i//ui-/scim-mozc-}
-done)
-
 # emacs-common-mozc
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -p -m0755 out_linux/Release/mozc_emacs_helper $RPM_BUILD_ROOT%{_bindir}
@@ -225,14 +196,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/mozc.xml
 %{_datadir}/ibus-mozc/*.png
 
-%files	-n scim-mozc
-%defattr(-,root,root,-)
-%doc data/installer/credits_en.html
-%lang(ja) %doc data/installer/credits_ja.html
-%{_libdir}/scim-1.0/*/IMEngine/mozc.so
-%{_libdir}/scim-1.0/*/SetupUI/mozc-setup.so
-%{_datadir}/scim/icons/*.png
-
 %files	-n emacs-common-mozc
 %defattr(-,root,root,-)
 %doc data/installer/credits_en.html
@@ -262,6 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri Aug 31 2012 Akira TAGOH <tagoh at redhat.com> - 1.6.1187.102-1
 - New upstream release. (#853362)
+  - no SCIM support anymore.
 - Update zipcode dictionaries.
 
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1090.102-3


More information about the scm-commits mailing list