Hello community, here is the log from the commit of package javahelp2 for openSUSE:Factory checked in at 2017-09-20 17:09:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javahelp2 (Old) and /work/SRC/openSUSE:Factory/.javahelp2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javahelp2" Wed Sep 20 17:09:42 2017 rev:18 rq:527124 version:2.0.05 Changes: -------- --- /work/SRC/openSUSE:Factory/javahelp2/javahelp2.changes 2017-05-22 10:48:36.691374579 +0200 +++ /work/SRC/openSUSE:Factory/.javahelp2.new/javahelp2.changes 2017-09-20 17:09:46.262217356 +0200 @@ -1,0 +2,6 @@ +Mon Sep 18 21:07:13 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java target and source 1.6 +- Clean spec file and fix duplicate waste error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javahelp2.spec ++++++ --- /var/tmp/diff_new_pack.rsBIJl/_old 2017-09-20 17:09:46.958119394 +0200 +++ /var/tmp/diff_new_pack.rsBIJl/_new 2017-09-20 17:09:46.962118831 +0200 @@ -31,6 +31,7 @@ Source3: %{oname}-%{version}.pom Source4: https://javahelp.dev.java.net/license.txt 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 @@ -38,7 +39,6 @@ BuildRequires: javapackages-tools Requires: geronimo-jsp-2_0-api Requires: geronimo-servlet-2_4-api -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -89,9 +89,9 @@ cp %{SOURCE4} . %build -#export JAVA_HOME=%{_jvmdir}/java-1.5.0 ant \ -f javahelp_nbproject/build.xml \ + -Djavac.source=1.6 -Djavac.target=1.6 \ -Djdic-jar-present=true \ -Djdic-zip-present=true \ -Dservlet-jar-present=true \ @@ -108,6 +108,7 @@ install -m 644 javahelp_nbproject/dist/lib/jhall.jar %{buildroot}%{_javadir}/%{name}.jar #cp -pr jhMaster/JavaHelp/doc/public-spec/dtd %{buildroot}%{_datadir}/%{name} cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # pom install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -116,7 +117,6 @@ %add_maven_depmap %files -%defattr(0644,root,root,0755) %doc license.txt %attr(0755,root,root) %{_bindir}/* %{_javadir}/%{name}.jar @@ -126,11 +126,9 @@ %{_datadir}/maven-metadata/%{name}.xml %files manual -%defattr(0644,root,root,0755) %doc jhMaster/JavaHelp/doc/public-spec/* %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog
