From caab4487517db70ce2d5f740574e4e8a9cfb2d193a880bca7f2acedc03fd9aa5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 3 Oct 2017 10:49:22 +0000 Subject: [PATCH] Don't use gcc-java OBS-URL: https://build.opensuse.org/package/show/Java:packages/regexp?expand=0&rev=16 --- regexp.changes | 6 ++++++ regexp.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/regexp.changes b/regexp.changes index 08644d5..ce8a588 100644 --- a/regexp.changes +++ b/regexp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 3 10:48:19 UTC 2017 - fstrba@suse.com + +- Don't depend on java-gcj-compat, since it is bound to go +- Specify java source and target level 1.6 + ------------------------------------------------------------------- Fri May 19 11:22:28 UTC 2017 - dziolkowski@suse.com diff --git a/regexp.spec b/regexp.spec index 6098013..4504606 100644 --- a/regexp.spec +++ b/regexp.spec @@ -30,7 +30,7 @@ Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{versi Source1: regexp-%{version}.pom BuildRequires: ant BuildRequires: ant >= 1.6 -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: xml-commons-apis-bootstrap @@ -56,7 +56,7 @@ find . -type f -name "*.jar" | xargs -t rm export OPT_JAR_LIST=: export CLASSPATH= mkdir lib -ant -Djakarta-site2.dir=. jar +ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar %install # jars