From 0cad068bf447b7a44c3710d2ef0d7902bf8a8db1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 31 May 2022 11:08:04 -0400 Subject: [PATCH 1/5] 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_.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 - 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) From ac2ebd3da7b7590d92f943ff71a48aa596ad9dbd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 31 May 2022 12:43:59 -0400 Subject: [PATCH 2/5] Make sure the upstream VERSION is set correctly - Use the initial numeric 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 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 - 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 From afaba7e36177b732f1d7e3fb57c227cea127fae5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Dec 2022 09:43:30 -0500 Subject: [PATCH 3/5] 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 - 1.53v-1 +- Update to 1.53v (close RHBZ#2121261) + * 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 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 a06cc2e696e16dfece6cead96554a8f174367e5b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Mar 2023 14:38:27 -0500 Subject: [PATCH 4/5] Convert License to SPDX --- imagej.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/imagej.spec b/imagej.spec index 3784b20..e7b10c2 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 a499d1818d4f698e9e2c3d6c869354b458451a36 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Mar 2023 12:44:43 -0500 Subject: [PATCH 5/5] 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 e7b10c2..b2e64f1 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 @@ -127,6 +127,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