Hello community, here is the log from the commit of package scirenderer for openSUSE:Factory checked in at 2017-09-23 21:33:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scirenderer (Old) and /work/SRC/openSUSE:Factory/.scirenderer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scirenderer" Sat Sep 23 21:33:02 2017 rev:4 rq:527468 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/scirenderer/scirenderer.changes 2015-04-16 14:14:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scirenderer.new/scirenderer.changes 2017-09-23 21:33:09.839288292 +0200 @@ -1,0 +2,10 @@ +Wed Sep 20 07:33:57 UTC 2017 - fst...@suse.com + +- Added patch: + * scirenderer-1.1.0-javadoc.patch + + use the source and target level 6 consistently in all javac + and javadoc invocations + + fix unresolved symbols when generating documentation +- Clean spec files and run fdupes + +------------------------------------------------------------------- New: ---- scirenderer-1.1.0-javadoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scirenderer.spec ++++++ --- /var/tmp/diff_new_pack.gNZzQE/_old 2017-09-23 21:33:11.635035750 +0200 +++ /var/tmp/diff_new_pack.gNZzQE/_new 2017-09-23 21:33:11.639035187 +0200 @@ -1,7 +1,7 @@ # # spec file for package scirenderer # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,14 +27,15 @@ Patch0: %{name}-0000-jogl2.0.2.patch # PATCH-FIX-UPSTREAM scirenderer-fix-compilation-with-jogl-2.3.patch badshah...@gmail.com -- Fix compilation with jogl 2.3.x Patch1: scirenderer-fix-compilation-with-jogl-2.3.patch +Patch2: scirenderer-1.1.0-javadoc.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: jlatexmath BuildRequires: jogl2 >= 2.3 BuildRequires: jpackage-utils Requires: java Requires: jpackage-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -55,6 +56,7 @@ %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Update path according to the openSUSE tee scirenderer-libs.properties << EOF @@ -67,21 +69,20 @@ sed -i '/Class-Path/I d' build.xml %build -%ant jar doc +%{ant} jar doc %install install -Dm 644 jar/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr docs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%defattr(-,root,root) %{_javadir}/%{name}.jar %doc README COPYING CHANGES %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name} %changelog ++++++ scirenderer-1.1.0-javadoc.patch ++++++ --- scirenderer-1.1.0/build.xml 2017-09-20 09:28:34.738932803 +0200 +++ scirenderer-1.1.0/build.xml 2017-09-20 09:31:22.759435307 +0200 @@ -126,7 +126,8 @@ verbose="off" listfiles="on" includeAntRuntime="no" - source="5" + source="6" + target="6" > <classpath> <path refid="compile.classpath" /> @@ -148,12 +149,18 @@ <javadoc destdir="${doc.dir}" author="true" + source="6" version="true" use="true" windowtitle="SciRenderer API"> <packageset dir="src" defaultexcludes="yes"> <include name="org/**"/> </packageset> + <classpath> + <path refid="compile.classpath" /> + <path location="${library.jar}" /> + <path location="${jogl2.jar}"/> + </classpath> </javadoc> </target>