From d1b8650451bbca8345f601bb077b8157ba1e0f20 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 31 May 2022 11:08:04 -0400
Subject: [PATCH 01/33] Fix regression in launcher script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Symlinks called “*” will not be created when there are no shared plugins or
  luts
- Broken symlinks into shared directories will be removed
- Symlink changes will be printed to the terminal
---
 imagej-1.53r-unix-script.patch | 36 ++++++++++++++++++++++------------
 imagej.spec                    |  9 ++++++++-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/imagej-1.53r-unix-script.patch b/imagej-1.53r-unix-script.patch
index edf6cb0..1d4b75e 100644
--- a/imagej-1.53r-unix-script.patch
+++ b/imagej-1.53r-unix-script.patch
@@ -1,6 +1,6 @@
 diff -Naur old/imagej.sh new/imagej.sh
---- old/imagej.sh	2022-05-30 08:40:52.860341530 -0400
-+++ new/imagej.sh	2022-05-30 09:23:56.439575119 -0400
+--- old/imagej.sh	2022-05-31 09:41:01.115425825 -0400
++++ new/imagej.sh	2022-05-31 11:03:48.189864410 -0400
 @@ -9,6 +9,9 @@
  # Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
  # $Revision: 51 $
@@ -48,7 +48,7 @@ diff -Naur old/imagej.sh new/imagej.sh
  # LOG FILE
  #ij_log="${ij_tmp}/log.txt"
  # default behaviour when an ImageJ window is already open
-@@ -84,44 +81,45 @@
+@@ -84,44 +81,57 @@
  declare -i max_mem
  declare -i free_mem
  
@@ -110,13 +110,25 @@ diff -Naur old/imagej.sh new/imagej.sh
 +# Make symbolic links from shared plugins, macros and luts 
 +for x in plugins macros luts
 +do
-+	for p in "${ij_data_path}/${x}"/*
-+	do
-+		if [[ ! -e "${ij_user_path}/${x}/$(basename "${p}")" ]]
-+		then
-+			ln -s "${p}" "${ij_user_path}/${x}/"
-+		fi
-+	done
++	# Add new symlinks
++	find "${ij_data_path}/${x}" -mindepth 1 -maxdepth 1 |
++		while read -r p
++		do
++			if [[ ! -e "${ij_user_path}/${x}/$(basename "${p}")" ]]
++			then
++				ln -vs "${p}" "${ij_user_path}/${x}/"
++			fi
++		done
++	# Clean up broken symlinks into the shared directory
++	find "${ij_user_path}/${x}" -mindepth 1 -maxdepth 1 -type l -printf '%p %l\n' |
++		while read -r p l
++		do
++			if [[ ! -e "${p}" ]] && \
++				[[ "$(dirname "${l}")" = "${ij_data_path}/${x}" ]]
++			then
++				rm -vf "${p}"
++			fi
++		done
 +done
 +
 +# enable plugins to be compiled with imageJ
@@ -125,7 +137,7 @@ diff -Naur old/imagej.sh new/imagej.sh
  # End Site specific variables ---------------------------------------------------------
  
  # other variables 
-@@ -320,7 +318,7 @@
+@@ -320,7 +330,7 @@
  
  # Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
  # this allows updating ij.jar without crashing running sessions
@@ -134,7 +146,7 @@ diff -Naur old/imagej.sh new/imagej.sh
                                           
  for mod_jar in ${ij_path}/lib/*jar  ; do
      modules="${modules:-}${modules+:}$mod_jar"
-@@ -470,9 +468,9 @@
+@@ -470,9 +480,9 @@
  fi
  
  if (( $verbosity > 0 )) ; then
diff --git a/imagej.spec b/imagej.spec
index a6641cf..7c6906c 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.53r
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 License:        Public Domain
@@ -110,6 +110,13 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-2
+- Fix regression in launcher script
+- Symlinks called “*” will not be created when there are no shared plugins or
+  luts
+- Broken symlinks into shared directories will be removed
+- Symlink changes will be printed to the terminal
+
 * Mon May 30 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-1
 - Adjust versioning scheme
 - Update to 1.53r (close RHBZ#1609549)

From 0bb9e619c92eac5a686aae3eb76ca33a4a72050e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 31 May 2022 12:43:59 -0400
Subject: [PATCH 02/33] Make sure the upstream VERSION is set correctly

- Use the initial numeric <pkgrel> field of the Release as the BUILD
---
 imagej.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 7c6906c..7019457 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.53r
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 License:        Public Domain
@@ -63,6 +63,14 @@ sed -r -i \
     -e 's#@PKGDATADIR@#%{_datadir}/imagej#' \
     imagej.sh
 
+# Make sure the upstream version number is set correctly, and use the initial
+# numeric <pkgrel> field of the Release as the BUILD.
+%global pkgrel %(echo '%{release}' | sed -r 's/[^[:digit:]].*$//')
+sed -r -i \
+    -e 's/(public static final String VERSION = )"[^"]+";/\1"%{version}";/' \
+    -e 's/(public static final String BUILD = )"[^"]+";/\1"%{pkgrel}";/' \
+    source/ij/ImageJ.java
+
 
 %build
 cd source
@@ -110,6 +118,10 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-3
+- Make sure the upstream VERSION is set correctly
+- Use the initial numeric <pkgrel> field of the Release as the BUILD
+
 * Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-2
 - Fix regression in launcher script
 - Symlinks called “*” will not be created when there are no shared plugins or

From 57ec7cbf9941b6cbe04485448bbdc7b49767b090 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 8 Jul 2022 15:23:51 +0200
Subject: [PATCH 03/33] Rebuilt for Drop i686 JDKs

https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
---
 imagej.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 7019457..d41ddc0 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.53r
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 License:        Public Domain
@@ -12,6 +12,7 @@ Source3:        https://rsb.info.nih.gov/ij/download/linux/unix-script.txt
 Source4:        imagej.png
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # Do not copy class files.
 Patch:          imagej-1.53r-do-not-copy-class-files.patch
@@ -118,6 +119,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.53r-4
+- Rebuilt for Drop i686 JDKs
+
 * Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-3
 - Make sure the upstream VERSION is set correctly
 - Use the initial numeric <pkgrel> field of the Release as the BUILD

From 693894fbbde3a41b8f2f770bc38e3f4ce3a57d14 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 14:35:55 +0000
Subject: [PATCH 04/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index d41ddc0..fce9687 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.53r
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 License:        Public Domain
@@ -119,6 +119,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.53r-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.53r-4
 - Rebuilt for Drop i686 JDKs
 

From 3092376bfa20bed60f7840c3004052fb5e877ed5 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 29 Dec 2022 09:43:30 -0500
Subject: [PATCH 05/33] Update to 1.53v (close RHBZ#2121261)

---
 .gitignore  |   2 +-
 imagej.png  | Bin 0 -> 13012 bytes
 imagej.spec |  11 +++++++----
 sources     |   3 +--
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 imagej.png

diff --git a/.gitignore b/.gitignore
index 4723b59..13662c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@ macros.zip
 /ij148e-src.zip
 /imagej-1.48-patch0.patch
 /imagej-1.48-patch1.patch
-/imagej.png
 /ij150h-src.zip
 /ij153r-src.zip
+/ij153v-src.zip
diff --git a/imagej.png b/imagej.png
new file mode 100644
index 0000000000000000000000000000000000000000..e98d80779736d2b9b06e1d32b85de0e413ee28e0
GIT binary patch
literal 13012
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
W!bY+z)8N1W0000<MNUMnLSTZF#2+C5

literal 0
HcmV?d00001

diff --git a/imagej.spec b/imagej.spec
index fce9687..cdc2ebb 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,11 +1,11 @@
 Name:           imagej
-Version:        1.53r
-Release:        5%{?dist}
+Version:        1.53v
+Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 License:        Public Domain
-URL:            https://rsbweb.nih.gov/ij/index.html
-Source0:        https://rsbweb.nih.gov/ij/download/src/ij%(echo '%{version}' | tr -d .)-src.zip
+URL:            https://imagej.net/ij/index.html
+Source0:        https://imagej.net/ij/download/src/ij%(echo '%{version}' | tr -d .)-src.zip
 Source1:        imagej.desktop
 Source2:        https://rsbweb.nih.gov/ij/macros/macros.zip
 Source3:        https://rsb.info.nih.gov/ij/download/linux/unix-script.txt
@@ -119,6 +119,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Thu Dec 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53v-1
+- Update to 1.53v (close RHBZ#2121261)
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.53r-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 88c24ec..fa3a086 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (ij153r-src.zip) = 2f062754dcf37716a22f12e9af3969ee6ef7ccd26d85cf6df760225e44876ff787884016c5d9367fe390c48a688de89678d24bede4dcea702a3bc4adb28c31a5
-SHA512 (imagej.png) = 60c2ff73bcfc668931c59b0dfb299723a369b741601bdd591a407302e30fc58c6c626525b3f08b955a5dab37729d3f704db689317b42a94e7a3ccbfb72abc9b3
+SHA512 (ij153v-src.zip) = 7436b3d1cc2461569f0091023d11b9b9b972a1ed05db30ff46568a3e61a0c049e4e43998d6e6567cdcfb6feb43d033dd695148d9e8ac7be301cb24dd6d8d7739
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 2047dda743b8ea08ab49b4660769bd0dcb0b2429 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 13:05:46 +0000
Subject: [PATCH 06/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index cdc2ebb..7d1cb05 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.53v
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 License:        Public Domain
@@ -119,6 +119,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.53v-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Dec 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53v-1
 - Update to 1.53v (close RHBZ#2121261)
 

From 02385520adb73fae53de8f928af5bf80610d5d08 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 10 Mar 2023 14:38:27 -0500
Subject: [PATCH 07/33] Convert License to SPDX

---
 imagej.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 7d1cb05..7075250 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -3,7 +3,16 @@ Version:        1.53v
 Release:        2%{?dist}
 Summary:        Image Processing and Analysis in Java
 
-License:        Public Domain
+# From https://imagej.nih.gov/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
+#   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.
+# https://gitlab.com/fedora/legal/fedora-license-data/-/commit/b216f9bcb1c3195b4ddb14674d95e299f669903a
+License:        LicenseRef-Fedora-Public-Domain
 URL:            https://imagej.net/ij/index.html
 Source0:        https://imagej.net/ij/download/src/ij%(echo '%{version}' | tr -d .)-src.zip
 Source1:        imagej.desktop

From 635436fe18910e875c8f9b745bc39fbfbb2dbc4c Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 10 Mar 2023 12:44:43 -0500
Subject: [PATCH 08/33] Update to 1.54c (close RHBZ#2175999)

---
 .gitignore  | 1 +
 imagej.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13662c1..26aacb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ macros.zip
 /ij150h-src.zip
 /ij153r-src.zip
 /ij153v-src.zip
+/ij154c-src.zip
diff --git a/imagej.spec b/imagej.spec
index 7075250..d31e39d 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
-Version:        1.53v
-Release:        2%{?dist}
+Version:        1.54c
+Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Fri Mar 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54c-1
+- Update to 1.54c (close RHBZ#2175999)
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.53v-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index fa3a086..7968760 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij153v-src.zip) = 7436b3d1cc2461569f0091023d11b9b9b972a1ed05db30ff46568a3e61a0c049e4e43998d6e6567cdcfb6feb43d033dd695148d9e8ac7be301cb24dd6d8d7739
+SHA512 (ij154c-src.zip) = 392f134b05aef266e735e2936bddda9b92c952a935a679f279adb7691581cca41c5537ec8f3ce7a0698af639c2b1a23ad0568a2b75c50148fb2cf32bf9427d56
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 90a1b75701a40ef39c71440adfe98242ec3935d5 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 25 Apr 2023 10:52:39 -0400
Subject: [PATCH 09/33] Update to 1.54d (close RHBZ#2183396)

---
 .gitignore  | 1 +
 imagej.spec | 5 ++++-
 sources     | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26aacb8..506934e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ macros.zip
 /ij153r-src.zip
 /ij153v-src.zip
 /ij154c-src.zip
+/ij154d-src.zip
diff --git a/imagej.spec b/imagej.spec
index d31e39d..97468e6 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54c
+Version:        1.54d
 Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Tue Apr 25 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54d-1
+- Update to 1.54d (close RHBZ#2183396)
+
 * Fri Mar 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54c-1
 - Update to 1.54c (close RHBZ#2175999)
 
diff --git a/sources b/sources
index 7968760..49978ce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (ij154c-src.zip) = 392f134b05aef266e735e2936bddda9b92c952a935a679f279adb7691581cca41c5537ec8f3ce7a0698af639c2b1a23ad0568a2b75c50148fb2cf32bf9427d56
-SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3
+SHA512 (ij154d-src.zip) = b49b290d59893467041297024eb4ce607a0c49d372173ad9bcdb71faa6e1a0c9a28f6f2d6ffef0e61914ad9e0ba132319566b432163af8fc5df3664f781956b1

From 2062380094dda332262a99f7ac251574971a3e71 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 25 Apr 2023 11:11:52 -0400
Subject: [PATCH 10/33] Fix missing source

---
 sources | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources b/sources
index 49978ce..2f649d8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (ij154d-src.zip) = b49b290d59893467041297024eb4ce607a0c49d372173ad9bcdb71faa6e1a0c9a28f6f2d6ffef0e61914ad9e0ba132319566b432163af8fc5df3664f781956b1
+SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From d592f9a29de85d19437c020f4e29bfc1ff728c1b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 5 Jun 2023 08:24:16 -0400
Subject: [PATCH 11/33] Update to 1.54e (close RHBZ#2212252)

---
 .gitignore  | 1 +
 imagej.spec | 2 +-
 sources     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 506934e..6475c13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ macros.zip
 /ij153v-src.zip
 /ij154c-src.zip
 /ij154d-src.zip
+/ij154e-src.zip
diff --git a/imagej.spec b/imagej.spec
index 97468e6..293bfde 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54d
+Version:        1.54e
 Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
diff --git a/sources b/sources
index 2f649d8..acdf627 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154d-src.zip) = b49b290d59893467041297024eb4ce607a0c49d372173ad9bcdb71faa6e1a0c9a28f6f2d6ffef0e61914ad9e0ba132319566b432163af8fc5df3664f781956b1
+SHA512 (ij154e-src.zip) = cb08de8a563cf4fe4432957a56ae352ee0ebb2ef220b9a00c0d28b432b2abda5215f173bae85ab68f6f8aef2c04d609238735dcc21d0557b7559437784b7eac7
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 8e802ac2178f229f423d7f4803d443d9a5756a5f Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 29 Jun 2023 20:56:27 -0400
Subject: [PATCH 12/33] Fix missing changelog entry

---
 imagej.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/imagej.spec b/imagej.spec
index 293bfde..e582517 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Mon Jun 05 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
+- Update to 1.54e (close RHBZ#2212252)
+
 * Tue Apr 25 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54d-1
 - Update to 1.54d (close RHBZ#2183396)
 

From e280fb45107eb142cb8dfe9c67dce713f3a7803e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 29 Jun 2023 20:55:39 -0400
Subject: [PATCH 13/33] Update to 1.54f (close RHBZ#2212252)

---
 .gitignore  | 1 +
 imagej.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6475c13..45f0ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ macros.zip
 /ij154c-src.zip
 /ij154d-src.zip
 /ij154e-src.zip
+/ij154f-src.zip
diff --git a/imagej.spec b/imagej.spec
index e582517..f2228b2 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54e
+Version:        1.54f
 Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Fri Jun 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
+- Update to 1.54f (close RHBZ#2212252)
+
 * Mon Jun 05 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
 - Update to 1.54e (close RHBZ#2212252)
 
diff --git a/sources b/sources
index acdf627..983af9f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154e-src.zip) = cb08de8a563cf4fe4432957a56ae352ee0ebb2ef220b9a00c0d28b432b2abda5215f173bae85ab68f6f8aef2c04d609238735dcc21d0557b7559437784b7eac7
+SHA512 (ij154f-src.zip) = d072a78f9de5b78a371c86edff9f31870cad0be60992664aee8fc9399d1a92d576107c3d913e1414fb70f6598b6c6c65b84a5a7c3a48939cc29f7a33c7bf4495
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 344ab18b3cc3223ffc09793d5430d326e78bf727 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 07:21:13 +0000
Subject: [PATCH 14/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index f2228b2..f1f2cf6 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.54f
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.54f-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Jun 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
 - Update to 1.54f (close RHBZ#2212252)
 

From 7e28a406025defab15038cdf7608daeb660572b3 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 19 Oct 2023 11:25:37 -0400
Subject: [PATCH 15/33] Update to 1.54g (close RHBZ#2244933)

---
 .gitignore                                               | 1 +
 ...s.patch => imagej-1.54g-do-not-copy-class-files.patch | 8 ++++----
 imagej.spec                                              | 9 ++++++---
 sources                                                  | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename imagej-1.53r-do-not-copy-class-files.patch => imagej-1.54g-do-not-copy-class-files.patch (63%)

diff --git a/.gitignore b/.gitignore
index 45f0ebf..b2509bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ macros.zip
 /ij154d-src.zip
 /ij154e-src.zip
 /ij154f-src.zip
+/ij154g-src.zip
diff --git a/imagej-1.53r-do-not-copy-class-files.patch b/imagej-1.54g-do-not-copy-class-files.patch
similarity index 63%
rename from imagej-1.53r-do-not-copy-class-files.patch
rename to imagej-1.54g-do-not-copy-class-files.patch
index 65d1223..a72a9d5 100644
--- a/imagej-1.53r-do-not-copy-class-files.patch
+++ b/imagej-1.54g-do-not-copy-class-files.patch
@@ -1,6 +1,6 @@
-diff -Naur old/source/build.xml new/source/build.xml
---- old/source/build.xml	2022-03-28 17:29:56.000000000 -0400
-+++ new/source/build.xml	2022-05-30 08:47:23.391364179 -0400
+diff -Naur imagej-1.54g-original/source/build.xml imagej-1.54g/source/build.xml
+--- imagej-1.54g-original/source/build.xml	2023-08-01 15:33:36.000000000 -0400
++++ imagej-1.54g/source/build.xml	2023-10-19 11:24:27.643291642 -0400
 @@ -24,8 +24,6 @@
      <copy file="IJ_Props.txt" todir="${build.dir}" />
      <copy file="images/microscope.gif" tofile="${build.dir}/microscope.gif" />
@@ -8,5 +8,5 @@ diff -Naur old/source/build.xml new/source/build.xml
 -    <copy file="plugins/MacAdapter.class" tofile="${build.dir}/ij/plugin/MacAdapter.class" />
 -    <copy file="plugins/MacAdapter9.class" tofile="${build.dir}/ij/plugin/MacAdapter9.class" />
      <copy todir="${build.dir}/macros"><fileset dir="macros"/></copy>
+     <copy file="functions.html" todir="${build.dir}" />
      <!-- Build ij.jar. -->
-     <jar jarfile="${jarfile}" basedir="${build.dir}"
diff --git a/imagej.spec b/imagej.spec
index f1f2cf6..88adaa5 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
-Version:        1.54f
-Release:        2%{?dist}
+Version:        1.54g
+Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -24,7 +24,7 @@ BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
 # Do not copy class files.
-Patch:          imagej-1.53r-do-not-copy-class-files.patch
+Patch:          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
 # Set javac source / target version to 1.8 to fix building with Java 11.
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Thu Oct 19 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54g-1
+- Update to 1.54g (close RHBZ#2244933)
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.54f-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 983af9f..0a5d01e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154f-src.zip) = d072a78f9de5b78a371c86edff9f31870cad0be60992664aee8fc9399d1a92d576107c3d913e1414fb70f6598b6c6c65b84a5a7c3a48939cc29f7a33c7bf4495
+SHA512 (ij154g-src.zip) = 3ae97899fd2f3eef28caf5c7a628106eff8462713efa6a9aeee9d2d392a952f88055c0e0de1913a96a3962647110d83d301ebbbbf4ce24aac0b6a0ae5ed21067
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 63b0dcaa581e377e62ea163212f87ec35cb425fe Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 22 Dec 2023 08:29:01 -0500
Subject: [PATCH 16/33] Update to 1.54h (close RHBZ#2254747)

---
 .gitignore  | 1 +
 imagej.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2509bf..c49e6dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ macros.zip
 /ij154e-src.zip
 /ij154f-src.zip
 /ij154g-src.zip
+/ij154h-src.zip
diff --git a/imagej.spec b/imagej.spec
index 88adaa5..3fbf127 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54g
+Version:        1.54h
 Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* Fri Dec 22 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54h-1
+- Update to 1.54h (close RHBZ#2254747)
+
 * Thu Oct 19 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54g-1
 - Update to 1.54g (close RHBZ#2244933)
 
diff --git a/sources b/sources
index 0a5d01e..2175ceb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154g-src.zip) = 3ae97899fd2f3eef28caf5c7a628106eff8462713efa6a9aeee9d2d392a952f88055c0e0de1913a96a3962647110d83d301ebbbbf4ce24aac0b6a0ae5ed21067
+SHA512 (ij154h-src.zip) = 01fa9d3c52aa7a4ba9b2407d6157f75f18c8a3e9ef5ea0e30414671b6fb421574016159fc82718904cfe774c851f50a1da1460ebadd0cdc4b54f9e62691563eb
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From cc214b6b8485dd63abb49789bd58442ee5f8ed17 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jan 2024 23:01:22 +0000
Subject: [PATCH 17/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 3fbf127..3533e6a 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.54h
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* 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)
 

From 116f808cba72ab075c9846534a3f756197bd38fb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 22:39:43 +0000
Subject: [PATCH 18/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 3533e6a..1fede94 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.54h
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* 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
 

From d6edd0e679128bab6fdb75436eab378a9968e9c5 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 15:43:06 +0100
Subject: [PATCH 19/33] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 1fede94..787ddef 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.54h
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* 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
 

From 0ca38c047f387f39bc9d82b732e00af52308fd85 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 4 Mar 2024 08:18:36 -0500
Subject: [PATCH 20/33] Update to 1.54i (close RHBZ#2267596)

---
 .gitignore  | 1 +
 imagej.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c49e6dd..5cf73fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ macros.zip
 /ij154f-src.zip
 /ij154g-src.zip
 /ij154h-src.zip
+/ij154i-src.zip
diff --git a/imagej.spec b/imagej.spec
index 787ddef..599055b 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
-Version:        1.54h
-Release:        4%{?dist}
+Version:        1.54i
+Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 2175ceb..bbb58ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154h-src.zip) = 01fa9d3c52aa7a4ba9b2407d6157f75f18c8a3e9ef5ea0e30414671b6fb421574016159fc82718904cfe774c851f50a1da1460ebadd0cdc4b54f9e62691563eb
+SHA512 (ij154i-src.zip) = ee36c336ea1d93144798d7bcf326a1fa1325e27d755c61953c7076be7d258113ddf128383a03037203e8ccce32fed8f0d48efe6a91f1fc111bbb3d8323de771c
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From ceb0db474a9fe6a8c38a01f150602b643cc0c6b0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 10:17:55 +0000
Subject: [PATCH 21/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 imagej.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 599055b..f4dc280 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.54i
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,6 +128,9 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
+* 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)
 

From 04f4c7ea87f0bc0121e76a66090999ea1a822ffb Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Sep 2024 10:35:20 -0400
Subject: [PATCH 22/33] Convert to %autorelease and %autochangelog

[skip changelog]
---
 changelog   | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++
 imagej.spec | 195 +---------------------------------------------------
 2 files changed, 194 insertions(+), 193 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5137285
--- /dev/null
+++ b/changelog
@@ -0,0 +1,192 @@
+* 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)
+
+* Thu Oct 19 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54g-1
+- Update to 1.54g (close RHBZ#2244933)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.54f-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
+- Update to 1.54f (close RHBZ#2212252)
+
+* Mon Jun 05 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
+- Update to 1.54e (close RHBZ#2212252)
+
+* Tue Apr 25 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54d-1
+- Update to 1.54d (close RHBZ#2183396)
+
+* Fri Mar 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54c-1
+- Update to 1.54c (close RHBZ#2175999)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.53v-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Dec 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53v-1
+- Update to 1.53v (close RHBZ#2121261)
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.53r-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.53r-4
+- Rebuilt for Drop i686 JDKs
+
+* Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-3
+- Make sure the upstream VERSION is set correctly
+- Use the initial numeric <pkgrel> field of the Release as the BUILD
+
+* Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-2
+- Fix regression in launcher script
+- Symlinks called “*” will not be created when there are no shared plugins or
+  luts
+- Broken symlinks into shared directories will be removed
+- Symlink changes will be printed to the terminal
+
+* Mon May 30 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-1
+- Adjust versioning scheme
+- Update to 1.53r (close RHBZ#1609549)
+- Use HTTPS URLs
+- Reduce macro indirection in the spec file
+- Drop javadoc API documentation due to bundled JavaScript and CSS
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.50-17.h
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-16.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-15.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-14.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Oct 06 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.50-13.h
+- Remove -dxx option from script (unsupported in java 11)
+- Fix patch
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-12.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jul 19 2020 Fabio Valentini <decathorpe@gmail.com> - 1.50-11.h
+- Set javac source and target to 1.8 to fix Java 11 builds.
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.50-10.h
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-9.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-8.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-7.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-6.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-5.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.50-4.h
+- Remove obsolete scriptlets
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-3.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-2.h
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Mar 26 2016 Adam Huffman <bloch@verdurin.com> - 1.50-1.h
+- Update to upstream release 1.50h
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-8.e
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jul 04 2015 Adam Huffman <bloch@verdurin.com> - 1.48-7.e
+- Apply Java docdir fixes from Michael Simacek
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.48-6.e
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Aug 13 2014 Adam Huffman <bloch@verdurin.com> - 1.48-5.e
+- Fix bogus dates in changelog
+
+* Wed Aug 13 2014 Adam Huffman <bloch@verdurin.com> - 1.48-4.e
+- Fix desktop file to ensure application appears in menus
+
+* Mon Jul 14 2014 Richard Hughes <richard@hughsie.com> - 1.48-3.e
+- Ship a larger application icon so the metdata parser can include the app.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.48-2.e
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Oct 26 2013 Adam Huffman <bloch@verdurin.com> - 1.48-1.e
+- Update to 1.48e
+
+* Sun Aug 25 2013 Adam Huffman <bloch@verdurin.com> - 1.47-1.v
+- Update to 1.47v
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46-4.d
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46-3.d
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46-2.d
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jan 11 2012 Adam Huffman <verdurin@fedoraproject.org> - 1.46-1.d
+- update to 1.45d
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.44-2.i
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Oct 30 2010 Georget Fabien <fabien.georget@gmail.com> 1.44-1.i
+- update to 1.44i
+- create imagej.jar link
+
+* Tue Sep 28 2010 Georget Fabien <fabien.georget@gmail.com> 1.44-1.h
+- version 1.44h
+
+* Fri Dec 11 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-1.m
+- version 1.43m
+
+* Sat Nov 21 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.5.j
+- set build directory to {name}-{version}
+- modify wrapper script
+- add java-devel to requires
+
+* Sun Nov 15 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.4.j
+- modify name from ImageJ to imagej
+- modify wrapper script for fedora compatibility
+
+* Tue Nov 10 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.3.j
+- get macros from  http://rsbweb.nih.gov/ij/macros/macros.zip
+- get launch script from  http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
+- don't copy macros in the jar but in /usr/share/ImageJ/macros
+
+* Tue Nov 10 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.2.j
+- change group to Application/Engineering
+- change description
+- add comments
+- change version tag
+
+* Sat Nov 8 2008 Georget Fabien <fabien.georget@gmail.com> 1.43-0.1
+- Creation
diff --git a/imagej.spec b/imagej.spec
index f4dc280..4a860bf 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,6 +1,6 @@
 Name:           imagej
 Version:        1.54i
-Release:        2%{?dist}
+Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
 # From https://imagej.nih.gov/ij/disclaimer.html:
@@ -128,195 +128,4 @@ desktop-file-install --vendor=''                     \
 
 
 %changelog
-* 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)
-
-* Thu Oct 19 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54g-1
-- Update to 1.54g (close RHBZ#2244933)
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.54f-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
-- Update to 1.54f (close RHBZ#2212252)
-
-* Mon Jun 05 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
-- Update to 1.54e (close RHBZ#2212252)
-
-* Tue Apr 25 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54d-1
-- Update to 1.54d (close RHBZ#2183396)
-
-* Fri Mar 10 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54c-1
-- Update to 1.54c (close RHBZ#2175999)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.53v-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Dec 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53v-1
-- Update to 1.53v (close RHBZ#2121261)
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.53r-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.53r-4
-- Rebuilt for Drop i686 JDKs
-
-* Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-3
-- Make sure the upstream VERSION is set correctly
-- Use the initial numeric <pkgrel> field of the Release as the BUILD
-
-* Tue May 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-2
-- Fix regression in launcher script
-- Symlinks called “*” will not be created when there are no shared plugins or
-  luts
-- Broken symlinks into shared directories will be removed
-- Symlink changes will be printed to the terminal
-
-* Mon May 30 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.53r-1
-- Adjust versioning scheme
-- Update to 1.53r (close RHBZ#1609549)
-- Use HTTPS URLs
-- Reduce macro indirection in the spec file
-- Drop javadoc API documentation due to bundled JavaScript and CSS
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.50-17.h
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-16.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-15.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-14.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Oct 06 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.50-13.h
-- Remove -dxx option from script (unsupported in java 11)
-- Fix patch
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-12.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jul 19 2020 Fabio Valentini <decathorpe@gmail.com> - 1.50-11.h
-- Set javac source and target to 1.8 to fix Java 11 builds.
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.50-10.h
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-9.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-8.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-7.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-6.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-5.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.50-4.h
-- Remove obsolete scriptlets
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-3.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.50-2.h
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Mar 26 2016 Adam Huffman <bloch@verdurin.com> - 1.50-1.h
-- Update to upstream release 1.50h
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-8.e
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jul 04 2015 Adam Huffman <bloch@verdurin.com> - 1.48-7.e
-- Apply Java docdir fixes from Michael Simacek
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.48-6.e
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Aug 13 2014 Adam Huffman <bloch@verdurin.com> - 1.48-5.e
-- Fix bogus dates in changelog
-
-* Wed Aug 13 2014 Adam Huffman <bloch@verdurin.com> - 1.48-4.e
-- Fix desktop file to ensure application appears in menus
-
-* Mon Jul 14 2014 Richard Hughes <richard@hughsie.com> - 1.48-3.e
-- Ship a larger application icon so the metdata parser can include the app.
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.48-2.e
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Oct 26 2013 Adam Huffman <bloch@verdurin.com> - 1.48-1.e
-- Update to 1.48e
-
-* Sun Aug 25 2013 Adam Huffman <bloch@verdurin.com> - 1.47-1.v
-- Update to 1.47v
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46-4.d
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46-3.d
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.46-2.d
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Jan 11 2012 Adam Huffman <verdurin@fedoraproject.org> - 1.46-1.d
-- update to 1.45d
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.44-2.i
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sat Oct 30 2010 Georget Fabien <fabien.georget@gmail.com> 1.44-1.i
-- update to 1.44i
-- create imagej.jar link
-
-* Tue Sep 28 2010 Georget Fabien <fabien.georget@gmail.com> 1.44-1.h
-- version 1.44h
-
-* Fri Dec 11 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-1.m
-- version 1.43m
-
-* Sat Nov 21 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.5.j
-- set build directory to {name}-{version}
-- modify wrapper script
-- add java-devel to requires
-
-* Sun Nov 15 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.4.j
-- modify name from ImageJ to imagej
-- modify wrapper script for fedora compatibility
-
-* Tue Nov 10 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.3.j
-- get macros from  http://rsbweb.nih.gov/ij/macros/macros.zip
-- get launch script from  http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
-- don't copy macros in the jar but in /usr/share/ImageJ/macros
-
-* Tue Nov 10 2009 Georget Fabien <fabien.georget@gmail.com> 1.43-0.2.j
-- change group to Application/Engineering
-- change description
-- add comments
-- change version tag
-
-* Sat Nov 8 2008 Georget Fabien <fabien.georget@gmail.com> 1.43-0.1
-- Creation
+%autochangelog

From 8dd56b3d2aff0ba327a4ee8ac0f1417de212831c Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Sep 2024 10:40:53 -0400
Subject: [PATCH 23/33] Update to 1.54k (close RHBZ#2292095)

---
 .gitignore  | 1 +
 imagej.spec | 6 +++---
 sources     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5cf73fb..56f837a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ macros.zip
 /ij154g-src.zip
 /ij154h-src.zip
 /ij154i-src.zip
+/ij154k-src.zip
diff --git a/imagej.spec b/imagej.spec
index 4a860bf..d5795b4 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54i
+Version:        1.54k
 Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
@@ -16,8 +16,8 @@ License:        LicenseRef-Fedora-Public-Domain
 URL:            https://imagej.net/ij/index.html
 Source0:        https://imagej.net/ij/download/src/ij%(echo '%{version}' | tr -d .)-src.zip
 Source1:        imagej.desktop
-Source2:        https://rsbweb.nih.gov/ij/macros/macros.zip
-Source3:        https://rsb.info.nih.gov/ij/download/linux/unix-script.txt
+Source2:        https://imagej.net/ij/macros/macros.zip
+Source3:        https://imagej.net/ij/download/linux/unix-script.txt
 Source4:        imagej.png
 
 BuildArch:      noarch
diff --git a/sources b/sources
index bbb58ca..e965a9f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154i-src.zip) = ee36c336ea1d93144798d7bcf326a1fa1325e27d755c61953c7076be7d258113ddf128383a03037203e8ccce32fed8f0d48efe6a91f1fc111bbb3d8323de771c
+SHA512 (ij154k-src.zip) = 70a654b2da8d969c89cf1e967571cd04f64801b3124d9b9fd41caef9ac8b3599e3ca37580ac67011ddf5718eb724d91e8f57c40f61f76438be5187c027392e29
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 83b1321d8572b9d18dc8126733a263893dc8d8ba Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Sep 2024 13:44:39 -0400
Subject: [PATCH 24/33] Number patches (for EPEL8 compatibility)

[skip changelog]
---
 imagej.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/imagej.spec b/imagej.spec
index d5795b4..3e2f86c 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -24,11 +24,11 @@ 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:  desktop-file-utils

From ae5d3f1fb356d2ec3db337401542536c554924eb Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Sep 2024 13:45:44 -0400
Subject: [PATCH 25/33] Add current link to public-domain dedication

---
 imagej.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imagej.spec b/imagej.spec
index 3e2f86c..700ae30 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -3,7 +3,8 @@ Version:        1.54k
 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

From 78f3c6c59203b1292614d66e688af6d5b9374d62 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Sep 2024 13:49:23 -0400
Subject: [PATCH 26/33] =?UTF-8?q?Package=20the=20public-domain=20dedicatio?=
 =?UTF-8?q?n/disclaimer=20text=20as=20a=20=E2=80=9Clicense=20file=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DISCLAIMER  | 7 +++++++
 imagej.spec | 4 ++++
 2 files changed, 11 insertions(+)
 create mode 100644 DISCLAIMER

diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..946818d
--- /dev/null
+++ b/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.
diff --git a/imagej.spec b/imagej.spec
index 700ae30..8925b72 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -20,6 +20,8 @@ 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
@@ -58,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
@@ -117,6 +120,7 @@ desktop-file-install --vendor=''                     \
 
 
 %files
+%license DISCLAIMER
 %doc source/aREADME.txt source/release-notes.html
 
 %{_javadir}/imagej.jar

From 3cc63bfcdf5ed86b03e589e574523ab1afdaee14 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 5 Dec 2024 23:11:04 -0500
Subject: [PATCH 27/33] Update to 1.54m (close RHBZ#2330712)

---
 .gitignore  | 1 +
 imagej.spec | 2 +-
 sources     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 56f837a..59599fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ macros.zip
 /ij154h-src.zip
 /ij154i-src.zip
 /ij154k-src.zip
+/ij154m-src.zip
diff --git a/imagej.spec b/imagej.spec
index 8925b72..04c8f2b 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54k
+Version:        1.54m
 Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
diff --git a/sources b/sources
index e965a9f..c747c2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154k-src.zip) = 70a654b2da8d969c89cf1e967571cd04f64801b3124d9b9fd41caef9ac8b3599e3ca37580ac67011ddf5718eb724d91e8f57c40f61f76438be5187c027392e29
+SHA512 (ij154m-src.zip) = 5e34f9b866796bd3bb4836fde391b80b10e05602f703f0c8d928179764bbdf0e8d1d44d01c1864426dec99e23d9f73e0ef8c83c6a00ae1ca7ae3be738ddebc5b
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 8931c93d22279290d9ad40bf8f2f4f2ff9af6d93 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 07:04:28 +0000
Subject: [PATCH 28/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 0e6472a3e05ec46e6c079afca13d94743cc3256b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 18 Feb 2025 10:30:57 -0500
Subject: [PATCH 29/33] Update to 1.54n (close RHBZ#2346161)

---
 .gitignore  | 1 +
 imagej.spec | 2 +-
 sources     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59599fe..a889430 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ macros.zip
 /ij154i-src.zip
 /ij154k-src.zip
 /ij154m-src.zip
+/ij154n-src.zip
diff --git a/imagej.spec b/imagej.spec
index 04c8f2b..a45c50d 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54m
+Version:        1.54n
 Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
diff --git a/sources b/sources
index c747c2b..d36ef29 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154m-src.zip) = 5e34f9b866796bd3bb4836fde391b80b10e05602f703f0c8d928179764bbdf0e8d1d44d01c1864426dec99e23d9f73e0ef8c83c6a00ae1ca7ae3be738ddebc5b
+SHA512 (ij154n-src.zip) = 58a60206133de79a6736ea8ae8d4e37664cbc8c8483f75d7929526631c01cec37655a34310087730a832cd3db5c34f364247b2e3cb7285a72c213b42c0819cba
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 6056245173b5bc3be5cf631af5f6e8705b1ae8b9 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 5 May 2025 13:24:44 -0400
Subject: [PATCH 30/33] Update to 1.54p (close RHBZ#2362770)

---
 .gitignore  | 1 +
 imagej.spec | 2 +-
 sources     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a889430..663182f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ macros.zip
 /ij154k-src.zip
 /ij154m-src.zip
 /ij154n-src.zip
+/ij154p-src.zip
diff --git a/imagej.spec b/imagej.spec
index a45c50d..255ed96 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54n
+Version:        1.54p
 Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
diff --git a/sources b/sources
index d36ef29..c11d32d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154n-src.zip) = 58a60206133de79a6736ea8ae8d4e37664cbc8c8483f75d7929526631c01cec37655a34310087730a832cd3db5c34f364247b2e3cb7285a72c213b42c0819cba
+SHA512 (ij154p-src.zip) = cd051bdefc563bb5492a4380f2cf933cad5b82eb5ff146502cb20014c3be731afd80fe61571ab533d74cbc1266e8091c3103a159b6bcff31600be1a52e7b1fde
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 4c052f0c2d8e355c8dbfdea25bc57182fe6f3227 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 17:37:26 +0000
Subject: [PATCH 31/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 85cbf29a5d2f44581cee5eb616b209e13fa52ec6 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Mon, 28 Jul 2025 19:01:15 +0200
Subject: [PATCH 32/33] Rebuilt for java-25-openjdk as preffered jdk

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.
---
 imagej.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/imagej.spec b/imagej.spec
index 255ed96..abdea5d 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -33,15 +33,15 @@ Patch2:         imagej-1.53r-unix-script.patch
 # Set javac source / target version to 1.8 to fix building with Java 11.
 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

From 68ab51b47dd7290e116a9e1051bedb9d31542c25 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 26 Sep 2025 12:55:21 +0100
Subject: [PATCH 33/33] Update to 1.54r (close RHBZ#2392662)

---
 .gitignore  | 1 +
 imagej.spec | 2 +-
 sources     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 663182f..744a44c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ macros.zip
 /ij154m-src.zip
 /ij154n-src.zip
 /ij154p-src.zip
+/ij154r-src.zip
diff --git a/imagej.spec b/imagej.spec
index abdea5d..9cce0f4 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54p
+Version:        1.54r
 Release:        %autorelease
 Summary:        Image Processing and Analysis in Java
 
diff --git a/sources b/sources
index c11d32d..ff75b1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154p-src.zip) = cd051bdefc563bb5492a4380f2cf933cad5b82eb5ff146502cb20014c3be731afd80fe61571ab533d74cbc1266e8091c3103a159b6bcff31600be1a52e7b1fde
+SHA512 (ij154r-src.zip) = eca256a4de84d46830e27dc452816c4fb209d1e1a62e555cc3984f46bdc3341d6bd8c7edc39adbe0ff0710de6141a170c5402d125e31ba0194a61368f49e9698
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3