Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2015-12-13 09:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2015-11-17 14:20:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new/protobuf.changes 2015-12-13 09:38:00.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Dec 7 04:17:12 UTC 2015 - [email protected] + +- disable google-apputils usage. They are only used for the testsuite which + wasn't called anyways. The next upstream version will not use + apputils anymore anyways. Fixes build on SLE12. + https://github.com/google/protobuf/commit/9f42f5f4a423b923f7b07ae8c5e8db4943df49c6 + bnc#957472 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.UjR6EH/_old 2015-12-13 09:38:01.000000000 +0100 +++ /var/tmp/diff_new_pack.UjR6EH/_new 2015-12-13 09:38:01.000000000 +0100 @@ -37,8 +37,7 @@ %else %bcond_with protobuf_java %endif -# Don't build the python bindings in SLE12 or old distros -%if ( 0%{?suse_version} == 1315 && !0%{?is_opensuse} ) || 0%{?suse_version} < 1210 +%if 0%{?suse_version} < 1210 %bcond_with protobuf_python %else %bcond_without protobuf_python @@ -52,7 +51,6 @@ %if %{with protobuf_python} BuildRequires: python-dateutil BuildRequires: python-devel -BuildRequires: python-google-apputils >= 0.4.2 BuildRequires: python-python-gflags BuildRequires: python-pytz BuildRequires: python-setuptools @@ -136,6 +134,13 @@ %setup -q %patch0 %patch1 -p1 +# +%if %{with protobuf_python} +# only needed for test suite which we don't call anyways. +# googleapis is broken on sle12 +sed -i '/apputils/d' python/setup.py +sed -i '/google_test_dir/d' python/setup.py +%endif %build %if 0%{?mandriva_version}
