diff --git a/javahelp2.changes b/javahelp2.changes index b244fca..85d8a7f 100644 --- a/javahelp2.changes +++ b/javahelp2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 20 17:26:50 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + ------------------------------------------------------------------- Mon Apr 15 14:07:51 UTC 2019 - Fridrich Strba diff --git a/javahelp2.spec b/javahelp2.spec index 03c4788..157d715 100644 --- a/javahelp2.spec +++ b/javahelp2.spec @@ -1,7 +1,7 @@ # # spec file for package javahelp2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Release: 0 Summary: Java online help system License: GPL-2.0-or-later Group: Development/Libraries/Java -Url: https://javahelp.dev.java.net/ +URL: https://javahelp.dev.java.net/ Source0: %{name}-src-%{version}.tar.bz2 # svn export -r 59 https://javahelp.dev.java.net/svn/javahelp/trunk javahelp2-2.0.05 --username guest Source1: %{name}-jhindexer.sh @@ -34,7 +34,7 @@ BuildRequires: ant >= 1.6.5 BuildRequires: fdupes BuildRequires: geronimo-jsp-2_0-api BuildRequires: geronimo-servlet-2_4-api -BuildRequires: java-devel >= 1.5.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools Requires: geronimo-jsp-2_0-api @@ -91,7 +91,7 @@ cp %{SOURCE4} . %build ant \ -f javahelp_nbproject/build.xml \ - -Djavac.source=1.6 -Djavac.target=1.6 \ + -Djavac.source=1.8 -Djavac.target=1.8 \ -Djdic-jar-present=true \ -Djdic-zip-present=true \ -Dservlet-jar-present=true \ @@ -116,14 +116,9 @@ install -pm 644 %{SOURCE3} \ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap -%files +%files -f .mfiles %doc license.txt %attr(0755,root,root) %{_bindir}/* -%{_javadir}/%{name}.jar -#%dir %{_datadir}/%{name} -#%{_datadir}/%{name}/dtd -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml %files manual %doc jhMaster/JavaHelp/doc/public-spec/*