From 2047dda743b8ea08ab49b4660769bd0dcb0b2429 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:05:46 +0000 Subject: [PATCH 01/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.53v-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 29 2022 Benjamin A. Beasley - 1.53v-1 - Update to 1.53v (close RHBZ#2121261) From 02385520adb73fae53de8f928af5bf80610d5d08 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Mar 2023 14:38:27 -0500 Subject: [PATCH 02/28] 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" Date: Fri, 10 Mar 2023 12:44:43 -0500 Subject: [PATCH 03/28] 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 - 1.54c-1 +- Update to 1.54c (close RHBZ#2175999) + * Thu Jan 19 2023 Fedora Release Engineering - 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" Date: Tue, 25 Apr 2023 10:52:39 -0400 Subject: [PATCH 04/28] 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 - 1.54d-1 +- Update to 1.54d (close RHBZ#2183396) + * Fri Mar 10 2023 Benjamin A. Beasley - 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" Date: Tue, 25 Apr 2023 11:11:52 -0400 Subject: [PATCH 05/28] 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" Date: Mon, 5 Jun 2023 08:24:16 -0400 Subject: [PATCH 06/28] 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" Date: Thu, 29 Jun 2023 20:56:27 -0400 Subject: [PATCH 07/28] 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 - 1.54f-1 +- Update to 1.54e (close RHBZ#2212252) + * Tue Apr 25 2023 Benjamin A. Beasley - 1.54d-1 - Update to 1.54d (close RHBZ#2183396) From e280fb45107eb142cb8dfe9c67dce713f3a7803e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Jun 2023 20:55:39 -0400 Subject: [PATCH 08/28] 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 - 1.54f-1 +- Update to 1.54f (close RHBZ#2212252) + * Mon Jun 05 2023 Benjamin A. Beasley - 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 Date: Thu, 20 Jul 2023 07:21:13 +0000 Subject: [PATCH 09/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.54f-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 30 2023 Benjamin A. Beasley - 1.54f-1 - Update to 1.54f (close RHBZ#2212252) From 7e28a406025defab15038cdf7608daeb660572b3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 19 Oct 2023 11:25:37 -0400 Subject: [PATCH 10/28] 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 @@ @@ -8,5 +8,5 @@ diff -Naur old/source/build.xml new/source/build.xml - - + - - 1.54g-1 +- Update to 1.54g (close RHBZ#2244933) + * Thu Jul 20 2023 Fedora Release Engineering - 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" Date: Fri, 22 Dec 2023 08:29:01 -0500 Subject: [PATCH 11/28] 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 - 1.54h-1 +- Update to 1.54h (close RHBZ#2254747) + * Thu Oct 19 2023 Benjamin A. Beasley - 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 Date: Sat, 20 Jan 2024 23:01:22 +0000 Subject: [PATCH 12/28] 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 - 1.54h-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 22 2023 Benjamin A. Beasley - 1.54h-1 - Update to 1.54h (close RHBZ#2254747) From 116f808cba72ab075c9846534a3f756197bd38fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:39:43 +0000 Subject: [PATCH 13/28] 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 - 1.54h-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 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 Date: Tue, 27 Feb 2024 15:43:06 +0100 Subject: [PATCH 14/28] 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 - 1.54h-4 +- Rebuilt for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 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" Date: Mon, 4 Mar 2024 08:18:36 -0500 Subject: [PATCH 15/28] 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 - 1.54i-1 +- Update to 1.54i (close RHBZ#2267596) + * Tue Feb 27 2024 Jiri Vanek - 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 Date: Thu, 18 Jul 2024 10:17:55 +0000 Subject: [PATCH 16/28] 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 - 1.54i-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Mar 04 2024 Benjamin A. Beasley - 1.54i-1 - Update to 1.54i (close RHBZ#2267596) From 04f4c7ea87f0bc0121e76a66090999ea1a822ffb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 17 Sep 2024 10:35:20 -0400 Subject: [PATCH 17/28] 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 - 1.54i-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Mar 04 2024 Benjamin A. Beasley - 1.54i-1 +- Update to 1.54i (close RHBZ#2267596) + +* Tue Feb 27 2024 Jiri Vanek - 1.54h-4 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 1.54h-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1.54h-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 22 2023 Benjamin A. Beasley - 1.54h-1 +- Update to 1.54h (close RHBZ#2254747) + +* Thu Oct 19 2023 Benjamin A. Beasley - 1.54g-1 +- Update to 1.54g (close RHBZ#2244933) + +* Thu Jul 20 2023 Fedora Release Engineering - 1.54f-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 30 2023 Benjamin A. Beasley - 1.54f-1 +- Update to 1.54f (close RHBZ#2212252) + +* Mon Jun 05 2023 Benjamin A. Beasley - 1.54f-1 +- Update to 1.54e (close RHBZ#2212252) + +* Tue Apr 25 2023 Benjamin A. Beasley - 1.54d-1 +- Update to 1.54d (close RHBZ#2183396) + +* Fri Mar 10 2023 Benjamin A. Beasley - 1.54c-1 +- Update to 1.54c (close RHBZ#2175999) + +* Thu Jan 19 2023 Fedora Release Engineering - 1.53v-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 29 2022 Benjamin A. Beasley - 1.53v-1 +- Update to 1.53v (close RHBZ#2121261) + +* Thu Jul 21 2022 Fedora Release Engineering - 1.53r-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.53r-4 +- Rebuilt for Drop i686 JDKs + +* Tue May 31 2022 Benjamin A. Beasley - 1.53r-3 +- Make sure the upstream VERSION is set correctly +- Use the initial numeric field of the Release as the BUILD + +* Tue May 31 2022 Benjamin A. Beasley - 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 - 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 - 1.50-17.h +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.50-16.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.50-15.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.50-14.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Oct 06 2020 Ankur Sinha - 1.50-13.h +- Remove -dxx option from script (unsupported in java 11) +- Fix patch + +* Tue Jul 28 2020 Fedora Release Engineering - 1.50-12.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jul 19 2020 Fabio Valentini - 1.50-11.h +- Set javac source and target to 1.8 to fix Java 11 builds. + +* Fri Jul 10 2020 Jiri Vanek - 1.50-10.h +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.50-9.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.50-8.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.50-7.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.50-6.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.50-5.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 Igor Gnatenko - 1.50-4.h +- Remove obsolete scriptlets + +* Wed Jul 26 2017 Fedora Release Engineering - 1.50-3.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.50-2.h +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Mar 26 2016 Adam Huffman - 1.50-1.h +- Update to upstream release 1.50h + +* Thu Feb 04 2016 Fedora Release Engineering - 1.48-8.e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Jul 04 2015 Adam Huffman - 1.48-7.e +- Apply Java docdir fixes from Michael Simacek + +* Wed Jun 17 2015 Fedora Release Engineering - 1.48-6.e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Aug 13 2014 Adam Huffman - 1.48-5.e +- Fix bogus dates in changelog + +* Wed Aug 13 2014 Adam Huffman - 1.48-4.e +- Fix desktop file to ensure application appears in menus + +* Mon Jul 14 2014 Richard Hughes - 1.48-3.e +- Ship a larger application icon so the metdata parser can include the app. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.48-2.e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Oct 26 2013 Adam Huffman - 1.48-1.e +- Update to 1.48e + +* Sun Aug 25 2013 Adam Huffman - 1.47-1.v +- Update to 1.47v + +* Sat Aug 03 2013 Fedora Release Engineering - 1.46-4.d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1.46-3.d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.46-2.d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jan 11 2012 Adam Huffman - 1.46-1.d +- update to 1.45d + +* Wed Feb 09 2011 Fedora Release Engineering - 1.44-2.i +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Oct 30 2010 Georget Fabien 1.44-1.i +- update to 1.44i +- create imagej.jar link + +* Tue Sep 28 2010 Georget Fabien 1.44-1.h +- version 1.44h + +* Fri Dec 11 2009 Georget Fabien 1.43-1.m +- version 1.43m + +* Sat Nov 21 2009 Georget Fabien 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 1.43-0.4.j +- modify name from ImageJ to imagej +- modify wrapper script for fedora compatibility + +* Tue Nov 10 2009 Georget Fabien 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 1.43-0.2.j +- change group to Application/Engineering +- change description +- add comments +- change version tag + +* Sat Nov 8 2008 Georget Fabien 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 - 1.54i-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Mar 04 2024 Benjamin A. Beasley - 1.54i-1 -- Update to 1.54i (close RHBZ#2267596) - -* Tue Feb 27 2024 Jiri Vanek - 1.54h-4 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 1.54h-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.54h-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 22 2023 Benjamin A. Beasley - 1.54h-1 -- Update to 1.54h (close RHBZ#2254747) - -* Thu Oct 19 2023 Benjamin A. Beasley - 1.54g-1 -- Update to 1.54g (close RHBZ#2244933) - -* Thu Jul 20 2023 Fedora Release Engineering - 1.54f-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 30 2023 Benjamin A. Beasley - 1.54f-1 -- Update to 1.54f (close RHBZ#2212252) - -* Mon Jun 05 2023 Benjamin A. Beasley - 1.54f-1 -- Update to 1.54e (close RHBZ#2212252) - -* Tue Apr 25 2023 Benjamin A. Beasley - 1.54d-1 -- Update to 1.54d (close RHBZ#2183396) - -* Fri Mar 10 2023 Benjamin A. Beasley - 1.54c-1 -- Update to 1.54c (close RHBZ#2175999) - -* Thu Jan 19 2023 Fedora Release Engineering - 1.53v-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 29 2022 Benjamin A. Beasley - 1.53v-1 -- Update to 1.53v (close RHBZ#2121261) - -* Thu Jul 21 2022 Fedora Release Engineering - 1.53r-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1.53r-4 -- Rebuilt for Drop i686 JDKs - -* Tue May 31 2022 Benjamin A. Beasley - 1.53r-3 -- Make sure the upstream VERSION is set correctly -- Use the initial numeric field of the Release as the BUILD - -* Tue May 31 2022 Benjamin A. Beasley - 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 - 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 - 1.50-17.h -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1.50-16.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.50-15.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.50-14.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Oct 06 2020 Ankur Sinha - 1.50-13.h -- Remove -dxx option from script (unsupported in java 11) -- Fix patch - -* Tue Jul 28 2020 Fedora Release Engineering - 1.50-12.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jul 19 2020 Fabio Valentini - 1.50-11.h -- Set javac source and target to 1.8 to fix Java 11 builds. - -* Fri Jul 10 2020 Jiri Vanek - 1.50-10.h -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 1.50-9.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.50-8.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.50-7.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.50-6.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.50-5.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 11 2018 Igor Gnatenko - 1.50-4.h -- Remove obsolete scriptlets - -* Wed Jul 26 2017 Fedora Release Engineering - 1.50-3.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.50-2.h -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Mar 26 2016 Adam Huffman - 1.50-1.h -- Update to upstream release 1.50h - -* Thu Feb 04 2016 Fedora Release Engineering - 1.48-8.e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jul 04 2015 Adam Huffman - 1.48-7.e -- Apply Java docdir fixes from Michael Simacek - -* Wed Jun 17 2015 Fedora Release Engineering - 1.48-6.e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Aug 13 2014 Adam Huffman - 1.48-5.e -- Fix bogus dates in changelog - -* Wed Aug 13 2014 Adam Huffman - 1.48-4.e -- Fix desktop file to ensure application appears in menus - -* Mon Jul 14 2014 Richard Hughes - 1.48-3.e -- Ship a larger application icon so the metdata parser can include the app. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.48-2.e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Oct 26 2013 Adam Huffman - 1.48-1.e -- Update to 1.48e - -* Sun Aug 25 2013 Adam Huffman - 1.47-1.v -- Update to 1.47v - -* Sat Aug 03 2013 Fedora Release Engineering - 1.46-4.d -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1.46-3.d -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.46-2.d -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jan 11 2012 Adam Huffman - 1.46-1.d -- update to 1.45d - -* Wed Feb 09 2011 Fedora Release Engineering - 1.44-2.i -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Oct 30 2010 Georget Fabien 1.44-1.i -- update to 1.44i -- create imagej.jar link - -* Tue Sep 28 2010 Georget Fabien 1.44-1.h -- version 1.44h - -* Fri Dec 11 2009 Georget Fabien 1.43-1.m -- version 1.43m - -* Sat Nov 21 2009 Georget Fabien 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 1.43-0.4.j -- modify name from ImageJ to imagej -- modify wrapper script for fedora compatibility - -* Tue Nov 10 2009 Georget Fabien 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 1.43-0.2.j -- change group to Application/Engineering -- change description -- add comments -- change version tag - -* Sat Nov 8 2008 Georget Fabien 1.43-0.1 -- Creation +%autochangelog From 8dd56b3d2aff0ba327a4ee8ac0f1417de212831c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 17 Sep 2024 10:40:53 -0400 Subject: [PATCH 18/28] 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" Date: Tue, 17 Sep 2024 13:44:39 -0400 Subject: [PATCH 19/28] 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" Date: Tue, 17 Sep 2024 13:45:44 -0400 Subject: [PATCH 20/28] 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" Date: Tue, 17 Sep 2024 13:49:23 -0400 Subject: [PATCH 21/28] =?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" Date: Thu, 5 Dec 2024 23:11:04 -0500 Subject: [PATCH 22/28] 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 Date: Fri, 17 Jan 2025 07:04:28 +0000 Subject: [PATCH 23/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0e6472a3e05ec46e6c079afca13d94743cc3256b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 18 Feb 2025 10:30:57 -0500 Subject: [PATCH 24/28] 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" Date: Mon, 5 May 2025 13:24:44 -0400 Subject: [PATCH 25/28] 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 Date: Thu, 24 Jul 2025 17:37:26 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 85cbf29a5d2f44581cee5eb616b209e13fa52ec6 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:01:15 +0200 Subject: [PATCH 27/28] 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" Date: Fri, 26 Sep 2025 12:55:21 +0100 Subject: [PATCH 28/28] 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