Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2013-09-02 15:00:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozc" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2013-07-23 22:23:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-09-02 15:00:35.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Sep 1 05:41:09 UTC 2013 - ftake@geeko.jp + +- Upstream update to 1.11.1522.102 + * Enable to customize ibus-mozc + * Add session command for ConvertPrevPage and ConvertNextPage +- Update fcitx-mozc + * Support usage of conversion candidates + * Support paging +- Add a source archive of gyp removed from the Mozc tree +- Clean up the spec file + +------------------------------------------------------------------- Old: ---- fcitx-mozc-1.11.1502.102.1.patch mozc-1.11.1502.102.tar.bz2 New: ---- fcitx-mozc-1.11.1522.102.1.patch gyp-r1665.tar.bz2 mozc-1.11.1522.102.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.gBf9gB/_old 2013-09-02 15:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.gBf9gB/_new 2013-09-02 15:00:38.000000000 +0200 @@ -24,8 +24,13 @@ %define fcitx_lib_dir %{_libdir}/fcitx/ %endif +%define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc +%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png +%define document_dir %{_docdir}/ibus-mozc +%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model + Name: mozc -Version: 1.11.1502.102 +Version: 1.11.1522.102 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux License: BSD-3-Clause @@ -37,8 +42,12 @@ Source2: fcitx-mozc-icons.tar.gz %if %{with_fcitx} # PATCH-FEATURE-UPSTREAM i@marguerite.su - add fcitx as mozc module -Patch0: fcitx-mozc-1.11.1502.102.1.patch +Patch0: fcitx-mozc-1.11.1522.102.1.patch %endif +# gyp is not included from 1.11.1522.102 +# License: BSD-3-Clause +# svn export http://gyp.googlecode.com/svn/trunk/@r1665 gyp +Source3: gyp-r1665.tar.bz2 BuildRequires: libopenssl-devel BuildRequires: pkgconfig @@ -110,11 +119,13 @@ %patch0 -p2 %endif -cmp handwriting/zinnia_handwriting.cc handwriting/zinnia_handwriting.cc.back && exit 1 || true -cmp base/util.cc base/util.cc.back && exit 1 || true - cp %{SOURCE1} . +# extract gyp +pushd third_party +tar xvf %{SOURCE3} +popd + %build %define target Release export QTDIR=%{_libdir}/qt4 @@ -122,7 +133,8 @@ # -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp. # gyp inserts -Wall to the head of release_extra_flags. flags=${RPM_OPT_FLAGS/-Wall/} -export GYP_DEFINES='use_libprotobuf=1 document_dir=%{_docdir}/%{name} zinnia_model_file=%{_datadir}/zinnia/model/tomoe/handwriting-ja.model release_extra_cflags="'$flags'"' + +export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=1 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'"' python build_mozc.py gyp --server_dir=%{_libdir}/mozc python build_mozc.py build_tools -c %{target} %{?_smp_mflags} @@ -143,11 +155,7 @@ install -m755 -d %{buildroot}%{_libdir}/ibus-mozc install -m755 %{output_dir}/ibus_mozc %{buildroot}%{_libdir}/ibus-mozc/ibus-engine-mozc install -m755 -d %{buildroot}%{_datadir}/ibus/component - -sed -i.back -e 's|/usr/libexec/ibus-engine-mozc|%{_libdir}/ibus-mozc/ibus-engine-mozc|' %{output_dir}/obj/gen/unix/ibus/mozc.xml -cmp %{output_dir}/obj/gen/unix/ibus/mozc.xml %{output_dir}/obj/gen/unix/ibus/mozc.xml.back && exit 1 || true install -m644 %{output_dir}/obj/gen/unix/ibus/mozc.xml %{buildroot}%{_datadir}/ibus/component/mozc.xml - install -m755 -d %{buildroot}%{_datadir}/ibus-mozc #{__install} -m755 -d %{buildroot}%{_datadir}/ibus-mozc/setup install -m644 data/images/unix/ime_product_icon_opensource-32.png %{buildroot}%{_datadir}/ibus-mozc/product_icon.png ++++++ fcitx-mozc-1.11.1502.102.1.patch -> fcitx-mozc-1.11.1522.102.1.patch ++++++ ++++ 704 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.11.1502.102.1.patch ++++ and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-1.11.1522.102.1.patch ++++++ mozc-1.11.1502.102.tar.bz2 -> mozc-1.11.1522.102.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-1.11.1502.102.tar.bz2 /work/SRC/openSUSE:Factory/.mozc.new/mozc-1.11.1522.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