Accepting request 347701 from devel:tools:building

- 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.
  9f42f5f4a4
  bnc#957472

OBS-URL: https://build.opensuse.org/request/show/347701
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf?expand=0&rev=24

protobuf.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Dec  7 04:17:12 UTC 2015 - lnussel@suse.de
+
+- 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
+
 -------------------------------------------------------------------
 Thu Nov 12 12:30:26 UTC 2015 - alarrosa@suse.com
 

protobuf.spec

@@ -37,8 +37,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %else
 %bcond_with protobuf_java
 %endif
-# Don't build the python bindings in SLE12 or old distros
+%if 0%{?suse_version} < 1210
-%if ( 0%{?suse_version} == 1315 && !0%{?is_opensuse} ) || 0%{?suse_version} < 1210
 %bcond_with protobuf_python
 %else
 %bcond_without protobuf_python
@@ -52,7 +51,6 @@ BuildRequires:  java-devel >= 1.6.0
 %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 @@ This package contains the Python bindings for Google Protocol Buffers.
 %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}