Browse Source

update to 1.5.1090.102
enable mozc_renderer
move ibus-engine-mozc from _libdir to _libexecdir


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

daisuke 13 years ago
parent
commit
a66afcc25a
1 changed files with 24 additions and 10 deletions
  1. 24 10
      m/mozc/mozc-vl.spec

+ 24 - 10
m/mozc/mozc-vl.spec

@@ -1,4 +1,4 @@
-%define		ver	1.5.1053.102
+%define		ver	1.5.1090.102
 %define		rel	1
 
 # if you want to make scim-mozc package, rpm --define with_scim:1
@@ -42,10 +42,10 @@ BuildRequires:	curl-devel
 BuildRequires:	protobuf-devel, gtest-devel
 BuildRequires:	qt4-devel
 BuildRequires:  gyp
-%if %{with_scim}
-# for scim-mozc
 BuildRequires:	pkgconfig
 BuildRequires:  gtk2-devel
+%if %{with_scim}
+# for scim-mozc
 BuildRequires:  scim-devel
 %endif
 # for 1.1.690.102+
@@ -160,12 +160,16 @@ unset QTDIR
   --use_libprotobuf
 
 %{__python} build_mozc.py build_tools -c Release
-%{__python} build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc \
+%{__python} build_mozc.py build -c Release \
+	    unix/ibus/ibus.gyp:ibus_mozc \
 %if %{with_scim}
-	    unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup \
+	    unix/scim/scim.gyp:scim_mozc \
+	    unix/scim/scim.gyp:scim_mozc_setup \
 %endif
-	    unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server \
-            gui/gui.gyp:mozc_tool
+	    unix/emacs/emacs.gyp:mozc_emacs_helper \
+	    server/server.gyp:mozc_server \
+            gui/gui.gyp:mozc_tool \
+	    renderer/renderer.gyp:mozc_renderer
 
 %install
 %{__rm} -rf %{buildroot}
@@ -177,9 +181,9 @@ unset QTDIR
 # main
 
 # ibus-mozc
-%{__cp} -p %{output_dir}/ibus_mozc %{buildroot}%{_libdir}/ibus-engine-mozc
+%{__cp} -p %{output_dir}/ibus_mozc %{buildroot}%{_libexecdir}/ibus-engine-mozc
 %{__mkdir_p} %{buildroot}%{_datadir}/ibus/component/
-%{__sed} 's|/usr/libexec|%{_libdir}|' < %{output_dir}/obj/gen/unix/ibus/mozc.xml > %{buildroot}%{_datadir}/ibus/component/mozc.xml
+%{__cp} -p %{output_dir}/obj/gen/unix/ibus/mozc.xml %{buildroot}%{_datadir}/ibus/component/
 ## install icons
 %{__mkdir_p} %{buildroot}%{_datadir}/ibus-mozc/setup
 (cd data/images/unix;
@@ -187,6 +191,8 @@ install -p -m0644 ime_product_icon_opensource-32.png %{buildroot}%{_datadir}/ibu
 for i in ui-*.png; do
         install -p -m0644 $i %{buildroot}%{_datadir}/ibus-mozc/${i//ui-/}
 done)
+# mozc_renderer
+%{__cp} -p %{output_dir}/mozc_renderer %{buildroot}%{_libexecdir}
 
 %if %{with_scim}
 # scim-mozc
@@ -211,6 +217,8 @@ done)
 # mozc_tool
 %{__cp} -p %{output_dir}/mozc_tool %{buildroot}%{_libexecdir}
 
+
+
 # mozc-el
 %{__cp} -p %{output_dir}/mozc_emacs_helper %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/%{name}/packages
@@ -272,7 +280,8 @@ fi
 %files -n ibus-mozc
 %defattr(-,root,root)
 %doc COPYING
-%{_libdir}/ibus-engine-mozc
+%{_libexecdir}/ibus-engine-mozc
+%{_libexecdir}/mozc_renderer
 %{_datadir}/ibus/component/mozc.xml
 %dir %{_datadir}/ibus-mozc
 %dir %{_datadir}/ibus-mozc/setup
@@ -297,6 +306,11 @@ fi
 
 
 %changelog
+* Tue Jun 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.1090.102-1
+- new upstream release 
+- enable mozc_renderer
+- move ibus-engine-mozc to %%_libexecdir
+
 * Wed May 09 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.1053.102-1
 - new upstream release 
 - add --use_libprotobuf to link with system protobuf