Fridrich Strba 2018-05-15 14:05:28 +00:00 committed by Git OBS Bridge
parent d2a615d201
commit 0e647b21a6
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 15 14:05:02 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility in OpenJDK 11
-------------------------------------------------------------------
Wed Sep 27 17:05:58 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package bcel
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version
Source2: bcel.keyring
Patch0: bcel-5.2-encoding.patch
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: java-devel >= 1.8
BuildRequires: regexp
BuildRequires: xml-commons-apis-bootstrap
#!BuildIgnore: xerces-j2
@ -75,11 +75,11 @@ touch manifest.txt
export CLASSPATH=%(build-classpath regexp)
export OPT_JAR_LIST="ant/ant-nodeps"
ant \
-Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \
-Dant.build.javac.target=8 -Dant.build.javac.source=8 \
-Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \
compile
ant \
-Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \
-Dant.build.javac.target=8 -Dant.build.javac.source=8 \
-Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \
jar