Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package imagej for openSUSE:Factory checked in at 2022-04-08 22:46:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imagej (Old) and /work/SRC/openSUSE:Factory/.imagej.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imagej" Fri Apr 8 22:46:13 2022 rev:10 rq:967838 version:1.53f Changes: -------- --- /work/SRC/openSUSE:Factory/imagej/imagej.changes 2020-12-09 22:21:57.787708348 +0100 +++ /work/SRC/openSUSE:Factory/.imagej.new.1900/imagej.changes 2022-04-08 22:46:36.342548466 +0200 @@ -1,0 +2,10 @@ +Fri Apr 8 13:44:13 UTC 2022 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- New: ---- imagej-nosourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imagej.spec ++++++ --- /var/tmp/diff_new_pack.LkEQmO/_old 2022-04-08 22:46:36.986541318 +0200 +++ /var/tmp/diff_new_pack.LkEQmO/_new 2022-04-08 22:46:36.990541273 +0200 @@ -28,12 +28,13 @@ 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 @@ %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} ++++++ imagej-nosourcetarget.patch ++++++ --- 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>
