From b78c75bfc6491231cfe3e1f76116d99586d73abc94d05c95a1a6d66f762cb6d7 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 7 Dec 2015 04:19:50 +0000 Subject: [PATCH 1/2] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=42 --- protobuf.changes | 8 ++++++++ protobuf.spec | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/protobuf.changes b/protobuf.changes index 38c6aaa..3a50ce5 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Nov 12 12:30:26 UTC 2015 - alarrosa@suse.com diff --git a/protobuf.spec b/protobuf.spec index 6a9e31a..b55e997 100644 --- a/protobuf.spec +++ b/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} == 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 @@ 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} From a0cc7759ba672b302da4fd584dc1c8b9c3da1e164f2e9ef7ccb7e1bbe42829d4 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 7 Dec 2015 05:59:12 +0000 Subject: [PATCH 2/2] bnc#957472 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=43 --- protobuf.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/protobuf.changes b/protobuf.changes index 3a50ce5..4609eea 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -5,6 +5,7 @@ Mon Dec 7 04:17:12 UTC 2015 - lnussel@suse.de 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