rpms/protobuf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Disabled Java subpackages

Browse Source 
Resolves: rhbz#1985866

Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
Adrian Reber 2021-07-26 08:06:19 +02:00
parent d791944d68
commit ddeca16f48
No known key found for this signature in database
GPG Key ID: 82C9378ED3C4906A
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protobuf.spec
View File

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