From 38bdf99ef6af625bf12cce66b3c84974c872bb20 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 1/7] Update to 1.54d (close RHBZ#2183396)

---
 .gitignore  | 1 +
 imagej.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 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..2f649d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ij154c-src.zip) = 392f134b05aef266e735e2936bddda9b92c952a935a679f279adb7691581cca41c5537ec8f3ce7a0698af639c2b1a23ad0568a2b75c50148fb2cf32bf9427d56
+SHA512 (ij154d-src.zip) = b49b290d59893467041297024eb4ce607a0c49d372173ad9bcdb71faa6e1a0c9a28f6f2d6ffef0e61914ad9e0ba132319566b432163af8fc5df3664f781956b1
 SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3

From 2708c274ab7c55b442898d5e325ba59c2893c902 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 2/7] 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 80e3881507fa2dff4e90f5e7bf436dd7fcd6a2ce 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 3/7] 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 e6be96f8952a6c794685d068a9d53e412a6014cc 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 4/7] 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 f7db30da0b5ab4aa26e910ff1b92030b5a7fd577 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 5/7] Update to 1.54g (close RHBZ#2244933)

---
 .gitignore                                                | 1 +
 ...es.patch => imagej-1.54g-do-not-copy-class-files.patch | 8 ++++----
 imagej.spec                                               | 7 +++++--
 sources                                                   | 2 +-
 4 files changed, 11 insertions(+), 7 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 f2228b2..296ea06 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54f
+Version:        1.54g
 Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
@@ -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)
+
 * Fri Jun 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54f-1
 - Update to 1.54f (close RHBZ#2212252)
 
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 6062ece347464d61f35e71e7451534616ba0f43f 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 6/7] 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 296ea06..ceeef40 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 77c578e97990e06121363f82f5968d5875abd65d 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 7/7] Update to 1.54i (close RHBZ#2267596)

---
 .gitignore  | 1 +
 imagej.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 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 ceeef40..b1fe1b0 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,5 +1,5 @@
 Name:           imagej
-Version:        1.54h
+Version:        1.54i
 Release:        1%{?dist}
 Summary:        Image Processing and Analysis in Java
 
@@ -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)
+
 * Fri Dec 22 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.54h-1
 - Update to 1.54h (close RHBZ#2254747)
 
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