Update to 1.54r (close RHBZ#2392662)

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.

.gitignore

@@ -20,3 +20,7 @@ macros.zip
 /ij154h-src.zip
 /ij154i-src.zip
 /ij154k-src.zip
+/ij154m-src.zip
+/ij154n-src.zip
+/ij154p-src.zip
+/ij154r-src.zip

DISCLAIMER

@@ -0,0 +1,7 @@
+ImageJ was developed at the National Institutes of Health by an employee of the
+Federal Government in the course of his official duties. Pursuant to Title 17,
+Section 105 of the United States Code, this software is not subject to
+copyright protection and is in the public domain. ImageJ is an experimental
+system. NIH assumes no responsibility whatsoever for its use by other parties,
+and makes no guarantees, expressed or implied, about its quality, reliability,
+or any other characteristic.

changelog

@@ -1,6 +1,18 @@
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.54i-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Mon Mar 04 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54i-1
 - Update to 1.54i (close RHBZ#2267596)
 
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.54h-4
+- Rebuilt for java-21-openjdk as system jdk
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.54h-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.54h-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Dec 22 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54h-1
 - Update to 1.54h (close RHBZ#2254747)
 

imagej.spec

@@ -1,9 +1,10 @@
 Name:           imagej
-Version:        1.54k
+Version:        1.54r
 Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
-# From https://imagej.nih.gov/ij/disclaimer.html:
+# From https://imagej.nih.gov/ij/disclaimer.html (now hosted at
+# https://imagej.net/ij/disclaimer.html):
 #   ImageJ was developed at the National Institutes of Health by an employee of
 #   the Federal Government in the course of his official duties. Pursuant to
 #   Title 17, Section 105 of the United States Code, this software is not
@@ -19,26 +20,28 @@ Source1:        imagej.desktop
 Source2:        https://imagej.net/ij/macros/macros.zip
 Source3:        https://imagej.net/ij/download/linux/unix-script.txt
 Source4:        imagej.png
+# Plain-text version of the contents of https://imagej.net/ij/disclaimer.html
+Source5:        DISCLAIMER
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
 # Do not copy class files.
-Patch:          imagej-1.54g-do-not-copy-class-files.patch
+Patch1:         imagej-1.54g-do-not-copy-class-files.patch
 # Modify imagej.sh (as intended by upstream) for Fedora compatibility.
-Patch:          imagej-1.53r-unix-script.patch
+Patch2:         imagej-1.53r-unix-script.patch
 # Set javac source / target version to 1.8 to fix building with Java 11.
-Patch:          imagej-1.53r-source-target-version.patch
+Patch3:         imagej-1.53r-source-target-version.patch
 
-BuildRequires:  ant
+BuildRequires:  ant-openjdk25 
 BuildRequires:  desktop-file-utils
 
 BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
+BuildRequires:  java-25-devel
 
 Requires:       jpackage-utils
 # Require java-devel, not only java, for plugins build
-Requires:       java-devel
+Requires:       java-25-devel
 
 # We no longer package javadoc documentation because it has guidelines issues
 # pertaining to bundled and pre-minified JavaScript and CSS.  See
@@ -57,6 +60,7 @@ used for quantitative analysis of engineering and scientific image data.
 %autosetup -c -N
 unzip -qq -u '%{SOURCE2}'
 cp -p '%{SOURCE3}' ./imagej.sh
+cp -p '%{SOURCE5}' .
 
 # Erase binary and useless files
 rm -rvf macros/.FBC* macros/build.xml __MACOSX
@@ -116,6 +120,7 @@ desktop-file-install --vendor=''                     \
 
 
 %files
+%license DISCLAIMER
 %doc source/aREADME.txt source/release-notes.html
 
 %{_javadir}/imagej.jar

sources

@@ -1,2 +1,2 @@
-SHA512 (ij154k-src.zip) = 70a654b2da8d969c89cf1e967571cd04f64801b3124d9b9fd41caef9ac8b3599e3ca37580ac67011ddf5718eb724d91e8f57c40f61f76438be5187c027392e29
+SHA512 (ij154r-src.zip) = eca256a4de84d46830e27dc452816c4fb209d1e1a62e555cc3984f46bdc3341d6bd8c7edc39adbe0ff0710de6141a170c5402d125e31ba0194a61368f49e9698
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3