Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2013-04-22 14:12:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozc", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2013-01-14 22:23:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-04-22 14:12:40.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 14 12:25:21 UTC 2013 - ftake@geeko.jp + +- upstream update to 1.10.1390.102 + * mozc_renderer now checks physycal monitor area + * add missing properties for gnome-shell +- update fcitx-mozc + * bug fixes and usability improvement + * new patch: fix-use_libprotobuf.patch + absolute path of protobuf, or mozc can't recognize + +------------------------------------------------------------------- +Thu Mar 28 18:42:12 UTC 2013 - i@marguerite.su + +- fix fcitx mozc icons. + * Defaults look too ugly that even lose face for openSUSE. + +------------------------------------------------------------------- Old: ---- fcitx-mozc-1.6.1187.102.3.patch mozc-1.6.1187.102.tar.bz2 New: ---- fcitx-mozc-1.10.1390.102.2.patch fcitx-mozc-icons.tar.gz fix-use_libprotobuf.patch mozc-1.10.1390.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.BCAelJ/_old 2013-04-22 14:12:54.000000000 +0200 +++ /var/tmp/diff_new_pack.BCAelJ/_new 2013-04-22 14:12:54.000000000 +0200 @@ -25,7 +25,7 @@ %endif Name: mozc -Version: 1.6.1187.102 +Version: 1.10.1390.102 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux License: BSD-3-Clause @@ -34,10 +34,13 @@ Url: http://code.google.com/p/mozc Source0: %{name}-%{version}.tar.bz2 Source1: README.SUSE +Source2: fcitx-mozc-icons.tar.gz %if %{with_fcitx} # PATCH-FEATURE-UPSTREAM i@marguerite.su - add fcitx as mozc module -Patch0: fcitx-mozc-1.6.1187.102.3.patch +Patch0: fcitx-mozc-1.10.1390.102.2.patch %endif +# PATCH-FIX-UPSTREAM ftake@geeko.jp - absolute path of protobuf, or mozc can't recognize. +Patch1: fix-use_libprotobuf.patch BuildRequires: libopenssl-devel BuildRequires: pkgconfig @@ -109,9 +112,11 @@ %patch0 -p2 %endif +%patch1 -p1 + # thease modification should be done by patches? sed -i.back -e 's|/usr/share/tegaki/models/zinnia/handwriting-ja.model|%{_datadir}/zinnia/model/tomoe/handwriting-ja.model|' handwriting/zinnia_handwriting.cc -sed -i.back -e 's|Util::JoinPath(Util::GetServerDirectory(), "documents")|"%{_docdir}/%{name}"|' base/util.cc +sed -i.back -e 's|Util::JoinPath(Util::GetServerDirectory(), "documents")|"%{_docdir}/%{name}"|' base/system_util.cc cmp handwriting/zinnia_handwriting.cc handwriting/zinnia_handwriting.cc.back && exit 1 || true cmp base/util.cc base/util.cc.back && exit 1 || true @@ -128,8 +133,8 @@ export GYP_DEFINES='use_libprotobuf=1 release_extra_cflags="'$flags'"' python build_mozc.py gyp --server_dir=%{_libdir}/mozc -python build_mozc.py build_tools -c %{target} -python build_mozc.py build -c %{target} \ +python build_mozc.py build_tools -c %{target} %{?_smp_mflags} +python build_mozc.py build -c %{target} %{?_smp_mflags} \ unix/ibus/ibus.gyp:ibus_mozc \ %if %{with_fcitx} unix/fcitx/fcitx.gyp:fcitx-mozc \ @@ -189,6 +194,14 @@ install -m 644 data/images/unix/ui-dictionary.png %{buildroot}%{fcitx_icon_dir}/mozc-dictionary.png install -m 644 data/images/unix/ui-properties.png %{buildroot}%{fcitx_icon_dir}/mozc-properties.png install -m 644 data/images/unix/ui-tool.png %{buildroot}%{fcitx_icon_dir}/mozc-tool.png + +# fix mozc icons. they're too ugly that even lose face for openSUSE. +cp -r %{SOURCE2} ./ +tar -xzf fcitx-mozc-icons.tar.gz +cp -r fcitx-mozc-icons/* %{buildroot}%{fcitx_icon_dir}/ +rm -rf fcitx-mozc-icons +rm -rf fcitx-mozc-icons.tar.gz + %endif install -m755 -d %{buildroot}%{_libdir}/mozc ++++++ fcitx-mozc-1.6.1187.102.3.patch -> fcitx-mozc-1.10.1390.102.2.patch ++++++ ++++ 817 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.6.1187.102.3.patch ++++ and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-1.10.1390.102.2.patch ++++++ fix-use_libprotobuf.patch ++++++ diff -ru mozc-1.10.1390.102.org/protobuf/genproto.gypi mozc-1.10.1390.102/protobuf/genproto.gypi --- mozc-1.10.1390.102.org/protobuf/genproto.gypi 2013-04-14 21:01:50.264276273 +0900 +++ mozc-1.10.1390.102/protobuf/genproto.gypi 2013-04-14 21:05:48.939025395 +0900 @@ -33,7 +33,7 @@ 'wrapper_path': '<(DEPTH)/build_tools/protoc_wrapper.py', }, 'conditions': [ - ['target_platform!="linux"', { + ['target_platform!="Linux"', { 'variables': { 'protoc_command%': '<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', }, @@ -45,7 +45,7 @@ }, }, { # else 'variables': { - 'protoc_command%': 'protoc<(EXECUTABLE_SUFFIX)', + 'protoc_command%': '/usr/bin/protoc<(EXECUTABLE_SUFFIX)', }, }], ], ++++++ mozc-1.6.1187.102.tar.bz2 -> mozc-1.10.1390.102.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-1.6.1187.102.tar.bz2 /work/SRC/openSUSE:Factory/.mozc.new/mozc-1.10.1390.102.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org