ソースの更新と mozc-config の追加

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1074 ec354946-7b23-47d6-9f5a-488ba84defc7

i/ibus-mozc/ibus-mozc-vl.spec

@@ -2,7 +2,7 @@ Name:		ibus-mozc
 Summary:	IBus engine for Mozc(GoogleIME)
 Summary(ja):	IBus 用 Mozc(Google日本語入力) エンジン
 Version:	0.11.0
-Release:	3%{?_dist_release}
+Release:	4%{?_dist_release}
 Group:		System Environment/Libraries
 License:	BSD-like
 URL:		http://code.google.com/p/mozc/
@@ -15,18 +15,20 @@ Source0:   %{name}-%{version}.tar.bz2
 Source1:	mozc-jinmei-20100513.7z
 Source2:	mozc-zipcode-20100513.7z
 Source3:	ibus-mozc.png
-Patch0:		ibus-mozc-fix-for-x86_64.diff
+
+# Setting tool for mozc
+# See http://github.com/hidegit/mozc-config
+Source10:	mozc-config.tar.bz2
+Source11:	ibus-setup-mozc.desktop
+
+#Patch0:		ibus-mozc-fix-for-x86_64.diff
 Patch1:		ibus-mozc-0.11.0-fix-compile-w-i386.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	python
-BuildRequires:	ibus-devel
-BuildRequires:	dbus-devel
-BuildRequires:	openssl-devel
-BuildRequires:	zlib-devel
-BuildRequires:	subversion
-BuildRequires:	curl-devel
-BuildRequires:	p7zip
+BuildRequires:	python, ibus-devel, dbus-devel
+BuildRequires:	openssl-devel, zlib-devel, subversion
+BuildRequires:	curl-devel, p7zip
+BuildRequires:	protobuf-devel, gtest-devel
 
 Packager:	kazutaka
 
@@ -45,51 +47,82 @@ Chromium OS や Windows、Mac、Linux といったマルチプラット
 
 
 %prep
-%setup -q -n src
-%patch0 -p0 -b .fix-x86_64
+%setup -q -n src -a 10
+#%patch0 -p0 -b .fix-x86_64
 %patch1 -p1 -b .fix-i386
 
 # Add some dictionaries
-cp %SOURCE1 data/dictionary/
-cp %SOURCE2 data/dictionary/
-cd data/dictionary/
+%{__cp} %SOURCE1 data/dictionary/
+%{__cp} %SOURCE2 data/dictionary/
+pushd data/dictionary/
 7za x mozc-jinmei-*.7z
 7za x mozc-zipcode-*.7z
-cat dictionary1.txt mozc-jinmei-*.txt mozc-zipcode-*.txt > dictionary1.txt.new
-mv dictionary1.txt.new dictionary1.txt
-cd -
+%{__cat} dictionary1.txt mozc-jinmei-*.txt mozc-zipcode-*.txt > dictionary1.txt.new
+%{__mv} dictionary1.txt.new dictionary1.txt
+popd
 
 %build
-%__python build_mozc.py gyp
-%__python build_mozc.py build_tools -c Release
-%__python build_mozc.py build -c Release unix/unix.gyp:ibus_mozc
+%{__python} build_mozc.py gyp
+%{__python} build_mozc.py build_tools -c Release
+%{__python} build_mozc.py build -c Release unix/unix.gyp:ibus_mozc
+
+# make mozc-config
+pushd mozc-config
+%{__make}
+popd
 
 %install
-rm -rf %buildroot
-mkdir -p %buildroot/%_libdir
-cp -p out/Release/ibus_mozc %buildroot/%_libdir/ibus-engine-mozc
-mkdir -p %buildroot/%_datadir/ibus/component/
-sed 's|/usr/libexec|%_libdir|' < unix/ibus/mozc.xml > %buildroot/%_datadir/ibus/component/mozc.xml
+%{__rm} -rf %buildroot
+%{__mkdir_p} %buildroot/%{_libdir}
+%{__cp} -p out/Release/ibus_mozc %buildroot/%{_libdir}/ibus-engine-mozc
+%{__mkdir_p} %buildroot/%{_datadir}/ibus/component/
+%{__sed} 's|/usr/libexec|%{_libdir}|' < unix/ibus/mozc.xml > %buildroot/%{_datadir}/ibus/component/mozc.xml
 
 # install icon (temporary)
-mkdir -p %buildroot/%{_datadir}/%{name}
-cp -p %{SOURCE3} %buildroot/%{_datadir}/%{name}/product_icon.png
+%{__mkdir_p} %buildroot/%{_datadir}/%{name}
+%{__cp} -p %{SOURCE3} %buildroot/%{_datadir}/%{name}/product_icon.png
 
 # install document
-chmod 644 debian/*
-cp debian/copyright COPYING
+%{__chmod} 644 debian/*
+%{__cp} debian/copyright COPYING
+
+# install mozc-config
+pushd mozc-config
+%{__make} install prefix=%buildroot/%{_prefix}
+popd
+
+# install desktop entry for ibus-setup-mozc
+%{__mkdir_p} %buildroot/%{_datadir}/applications
+%{__cp} %{SOURCE11} %buildroot/%{_datadir}/applications
+
+# install document for mozc-config
+%{__cp} mozc-config/README README.mozc-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING
+%doc COPYING README.mozc-config
 %{_libdir}/ibus-engine-mozc
 %{_datadir}/ibus/component/mozc.xml
 %{_datadir}/%{name}/product_icon.png
-
+# for mozc-config
+%{_bindir}/mozc-config
+%{_bindir}/mozc-dict
+%{_datadir}/applications/ibus-setup-mozc.desktop
+%{_datadir}/ibus-mozc/setup/setup.glade
+%{_libexecdir}/ibus-setup-mozc
+%{_localedir}/ja/LC_MESSAGES/ibus-mozc.mo
+
+   
 %changelog
+* Sun May 23 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 0.11.0-4
+- update source to revision 23
+- add BuildRequires protobuf-devel, gtest-devel
+- drop Patch0 (ibus-mozc-fix-for-x86_64.diff)
+- add mozc-config as Source10 and desktop entry as Source11
+
 * Sat May 15 2010 IWAI, Masaharu <iwai@alib.jp> 0.11.0-3
 - rebuild with ibus-1.3.3