Accepting request 967838 from science

OBS-URL: https://build.opensuse.org/request/show/967838
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/imagej?expand=0&rev=10

imagej-nosourcetarget.patch

@@ -0,0 +1,11 @@
+--- source/build.xml	2022-04-08 15:40:02.598001218 +0200
++++ source/build.xml	2022-04-08 15:43:15.611177038 +0200
+@@ -6,7 +6,7 @@
+     <!-- First, ensure the build directory exists. -->
+     <mkdir dir="build" />
+     <!-- Build everything; add debug="on" to debug -->
+-    <javac srcdir="./ij" destdir="build" optimize="on" source="1.6" target="1.6" debug="on" includeantruntime="false" encoding="utf-8">
++    <javac srcdir="./ij" destdir="build" optimize="on" debug="on" includeantruntime="false" encoding="utf-8">
+     </javac>
+   </target>
+   

imagej.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr  8 13:44:13 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+  * Fixes build in Factory with jdk17
+- Added patch:
+  * imagej-nosourcetarget.patch
+    + Do not hardcode source and target levels, but allow them to
+      be specified on ant's command-line
+
 -------------------------------------------------------------------
 Wed Dec  2 18:37:15 UTC 2020 - andy great <andythe_great@pm.me>
 

imagej.spec

@@ -28,12 +28,13 @@ Url:            http://rsbweb.nih.gov/ij/
 Source:         http://rsbweb.nih.gov/ij/download/src/ij%{SrcVersion}-src.zip
 Source1:        %{name}.in
 Source2:        %{name}.desktop
+Patch0:         imagej-nosourcetarget.patch
 BuildRequires:  ImageMagick
 BuildRequires:  ant
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
-Requires:       java >= 1.6.0
+Requires:       java >= 1.8
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -60,9 +61,10 @@ compiler.
 
 %prep
 %setup -n source
+%patch0 -p1
 
 %build
-%ant build
+%ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 build
 
 %install
 install -d -m 755 %{buildroot}%{_datadir}/%{name}