diff --git a/protobuf.spec b/protobuf.spec index 9dd2fb3..ae27709 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -1,7 +1,7 @@ # Build -python subpackage %bcond_without python # Build -java subpackage -%bcond_without java +%bcond_with java #global rcver rc2 # Disable LTO to work around annobin error messages @@ -10,7 +10,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 3.14.0 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz @@ -202,11 +202,9 @@ descriptions in the Emacs editor. %prep %setup -q -n %{name}-%{version}%{?rcver} -a 3 -%ifarch %{ix86} armv7hl -# IoTest.LargeOutput fails on 32bit arches +# IoTest.LargeOutput fails sometimes if not enough memory is available # https://github.com/protocolbuffers/protobuf/issues/8082 %patch1 -p1 -%endif mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/ find -name \*.cc -o -name \*.h | xargs chmod -x chmod 644 examples/* @@ -386,6 +384,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %changelog +* Mon Jul 26 2021 Adrian Reber - 3.14.0-7 +- Disabled Java subpackages + * Thu May 06 2021 Adrian Reber - 3.14.0-6 - Reintroduce the emacs subpackage to avoid file conflicts between protobuf-compiler.x86_64 and protobuf-compiler.i686