Fridrich Strba 2018-05-15 13:58:14 +00:00 committed by Git OBS Bridge
parent 752a4285ba
commit e649351ab3
2 changed files with 10 additions and 4 deletions

View File

@ -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 Fri Sep 15 16:14:15 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package avalon-logkit # 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 # Copyright (c) 2000-2005, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -37,7 +37,7 @@ Patch3: fix-java7-compile.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.6 BuildRequires: java-devel >= 1.8
BuildRequires: javamail BuildRequires: javamail
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
@ -83,7 +83,7 @@ build-jar-repository -s -p target/lib \
tomcat-servlet-api \ tomcat-servlet-api \
junit \ 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 \ -Dencoding=ISO-8859-1 -Dnoget=true -lib %{_datadir}/java \
jar javadoc jar javadoc
@ -100,7 +100,7 @@ install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
# javadoc # javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt