From 62e7fba055a7b739b38be9f148e3a00b915d9c97 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Mar 2023 14:38:27 -0500 Subject: [PATCH 1/7] Convert License to SPDX --- imagej.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/imagej.spec b/imagej.spec index cdc2ebb..c33c1e4 100644 --- a/imagej.spec +++ b/imagej.spec @@ -3,7 +3,16 @@ Version: 1.53v Release: 1%{?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 188afc66ce93ad771c37476422af84ce83ad4224 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Mar 2023 12:44:43 -0500 Subject: [PATCH 2/7] Update to 1.54c (close RHBZ#2175999) --- .gitignore | 1 + imagej.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 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 c33c1e4..bcfd883 100644 --- a/imagej.spec +++ b/imagej.spec @@ -1,5 +1,5 @@ Name: imagej -Version: 1.53v +Version: 1.54c Release: 1%{?dist} Summary: Image Processing and Analysis in Java @@ -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 Dec 29 2022 Benjamin A. Beasley - 1.53v-1 - Update to 1.53v (close RHBZ#2121261) 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 95f02939951b8982dd770a4c6546bd9641e71e4c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 25 Apr 2023 10:52:39 -0400 Subject: [PATCH 3/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 bcfd883..b4dabff 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..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 5a02891901c8f823a4ec42cfc0f7da2c2cffd05d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 5 Jun 2023 08:24:16 -0400 Subject: [PATCH 4/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 b4dabff..bc6c274 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 e1be37f4fe9b7edd9ecd29074bcdcbb5fcc8a79f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Jun 2023 20:56:27 -0400 Subject: [PATCH 5/7] Fix missing changelog entry --- imagej.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/imagej.spec b/imagej.spec index bc6c274..586e2ef 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 6276f8bdf06f21cdbda7af2aff53e3f7bb5bf995 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Jun 2023 20:55:39 -0400 Subject: [PATCH 6/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 586e2ef..8e1aa2f 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 99d1c47db2ec59234245ad6052312fbe6662ef98 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 19 Oct 2023 11:25:37 -0400 Subject: [PATCH 7/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 @@ @@ -8,5 +8,5 @@ diff -Naur old/source/build.xml new/source/build.xml - - + - - 1.54g-1 +- Update to 1.54g (close RHBZ#2244933) + * Fri Jun 30 2023 Benjamin A. Beasley - 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