From 885faa0f4567680cc5d3a14c22e51399518bc4d389e2417851fe3e7ce7a54d81 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 16 May 2018 10:45:16 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/cpptasks?expand=0&rev=8 --- cpptasks.changes | 6 ++++++ cpptasks.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cpptasks.changes b/cpptasks.changes index 57e6c0e..5215ed5 100644 --- a/cpptasks.changes +++ b/cpptasks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 16 10:44:34 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 + ------------------------------------------------------------------- Thu Sep 21 14:41:05 UTC 2017 - kkaempf@suse.com diff --git a/cpptasks.spec b/cpptasks.spec index f6656e0..5e319be 100644 --- a/cpptasks.spec +++ b/cpptasks.spec @@ -1,7 +1,7 @@ # # spec file for package cpptasks # -# 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 @@ -27,10 +27,11 @@ Source0: http://downloads.sourceforge.net/ant-contrib/%{name}-%{version}. BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: jpackage-utils BuildRequires: junit Requires: ant -Requires: java +Requires: java >= 1.8 BuildArch: noarch %description @@ -54,7 +55,7 @@ find . -name '*.jar' -type f -delete -print export OPT_JAR_LIST="ant/ant-junit junit" export CLASSPATH="" %{ant} \ - -Djavac.source=1.6 -Djavac.target=1.6 \ + -Djavac.source=8 -Djavac.target=8 \ jars javadocs %install From e456a7c8b5c66a44323b9d2da94979a88c285ada7ea602daa9cf3e9ca5ea7fc0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 20:00:40 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/cpptasks?expand=0&rev=9 --- cpptasks.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpptasks.changes b/cpptasks.changes index 5215ed5..0ed2769 100644 --- a/cpptasks.changes +++ b/cpptasks.changes @@ -2,7 +2,7 @@ Wed May 16 10:44:34 UTC 2018 - fstrba@suse.com - Build with source and target 8 to prepare for a possible removal - of 1.6 compatibility in OpenJDK 11 + of 1.6 compatibility ------------------------------------------------------------------- Thu Sep 21 14:41:05 UTC 2017 - kkaempf@suse.com