Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2016-08-05 18:17:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-07-30 00:27:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-08-05 18:17:10.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Aug 2 12:54:33 UTC 2016 - ft...@geeko.jp + +- fix unnecessary "BuildRequires: protobuf-devel" + +------------------------------------------------------------------- +Fri Jul 29 14:13:39 UTC 2016 - norm...@linux.vnet.ibm.com + +- remove ExcludeArch as related failure caused by workaround +- remove workaround https://llvm.org/bugs/show_bug.cgi?id=22248 + in spec as now using gcc not clang. + remove mozc-stack-protector.patch + +------------------------------------------------------------------- Old: ---- mozc-stack-protector.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.1yaJXM/_old 2016-08-05 18:17:12.000000000 +0200 +++ /var/tmp/diff_new_pack.1yaJXM/_new 2016-08-05 18:17:12.000000000 +0200 @@ -28,6 +28,7 @@ %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 +%define use_libprotobuf 0 Name: mozc Version: 2.17.2313.102 @@ -84,9 +85,6 @@ # PATCH-FIX-UPSTREAM marguer...@opensuse.org Patch2: mozc-ninja-verbose-build.patch -# PATCH-FIX-OPENSUSE dval...@suse.com -Patch3: mozc-stack-protector.patch - # PATCH-FIX-UPSTREAM - https://groups.google.com/forum/#!topic/protobuf/ZXxXR3uPAM4 Patch4: protobuf-generic-atomic.patch Patch5: protobuf-atomic.patch @@ -100,17 +98,15 @@ BuildRequires: ninja >= 1.4 BuildRequires: pkgconfig +%if %{use_libprotobuf} BuildRequires: protobuf-devel +%endif BuildRequires: python BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Exclude PowerPC and arm64 arches because no support in -# third_party/protobuf/src/google/protobuf/stubs/ atomicops -ExcludeArch: ppc ppc64 ppc64le aarch64 - %description Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Mac and Linux. This open-source @@ -178,9 +174,6 @@ %patch1 -p2 %patch2 -p2 -%ifarch ppc ppc64 ppc64le -%patch3 -p1 -%endif cp %{SOURCE1} . @@ -191,11 +184,13 @@ # japanese_usage_dictionary tar xvf %{SOURCE5} # protobuf +%if ! %{use_libprotobuf} tar xvf %{SOURCE6} cd protobuf %patch4 -p1 %patch5 -p1 cd .. +%endif popd %patch6 -p1 @@ -219,11 +214,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/} -%ifarch ppc ppc64 ppc64le -flags=${flags/-fstack-protector/} -%endif -export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=0 use_libzinnia=1 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'"' +export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=%{use_libprotobuf} use_libzinnia=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 -c %{target} \
