From e649351ab3b63ba0a6c6e83f22fedfdc0d6d2704370516beea87fcb23d9f4a1e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 15 May 2018 13:58:14 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/avalon-logkit?expand=0&rev=28 --- avalon-logkit.changes | 6 ++++++ avalon-logkit.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/avalon-logkit.changes b/avalon-logkit.changes index e1be841..60f6b3a 100644 --- a/avalon-logkit.changes +++ b/avalon-logkit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 15 13:57:23 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 + ------------------------------------------------------------------- Fri Sep 15 16:14:15 UTC 2017 - jengelh@inai.de diff --git a/avalon-logkit.spec b/avalon-logkit.spec index 603b08d..052959a 100644 --- a/avalon-logkit.spec +++ b/avalon-logkit.spec @@ -1,7 +1,7 @@ # # spec file for package avalon-logkit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2005, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -37,7 +37,7 @@ Patch3: fix-java7-compile.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javamail BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -83,7 +83,7 @@ build-jar-repository -s -p target/lib \ tomcat-servlet-api \ junit \ -ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ +ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ -Dencoding=ISO-8859-1 -Dnoget=true -lib %{_datadir}/java \ jar javadoc @@ -100,7 +100,7 @@ install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} -%fdupes %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files %doc LICENSE.txt NOTICE.txt From 2ce0baf3616be36b61a47263ee3c124ed22681d08b8ea98acae18f872191a496 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:58:53 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/avalon-logkit?expand=0&rev=29 --- avalon-logkit.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avalon-logkit.changes b/avalon-logkit.changes index 60f6b3a..afbb4e6 100644 --- a/avalon-logkit.changes +++ b/avalon-logkit.changes @@ -2,7 +2,7 @@ Tue May 15 13:57:23 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 ------------------------------------------------------------------- Fri Sep 15 16:14:15 UTC 2017 - jengelh@inai.de