rpm/protobuf
SHA256
1
0
Fork 0
forked from pool/protobuf
Code Pull Requests Activity

Accepting request 708508 from home:fstrba:maven

Browse Source 
Specify source and targer levels

OBS-URL: https://build.opensuse.org/request/show/708508
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=75
This commit is contained in:
Martin Pluskal
2019-06-08 16:22:03 +00:00
committed by Git OBS Bridge
parent d8c9afa12f
commit 8125f843e6
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
protobuf.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jun 8 06:13:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify java source and target levels in order to build
compatible protobuf-java binaries
-------------------------------------------------------------------
Wed Jun 5 18:58:30 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

3
protobuf.spec
View File

@@ -20,6 +20,7 @@
%define sover 19
%define tarname protobuf
%define src_install_dir /usr/src/%{name}
%define extra_java_flags -source 7 -target 7
# requires gmock, which is not yet in the distribution
%bcond_with check
%bcond_without java
@@ -164,7 +165,7 @@ make %{?_smp_mflags}
pushd java
../src/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto
mkdir classes
javac $extra_java_flags -d classes core/src/main/java/com/google/protobuf/*.java
javac %{extra_java_flags} -d classes core/src/main/java/com/google/protobuf/*.java
sed -e 's/@VERSION@/%{version}/' < %{SOURCE1} > manifest.txt
jar cfm %{name}-java-%{version}.jar manifest.txt -C classes com
popd