Compare commits
49 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
68ab51b47d | ||
|
85cbf29a5d | ||
|
4c052f0c2d | ||
|
|
6056245173 | ||
|
|
0e6472a3e0 | ||
|
|
8931c93d22 | ||
|
|
3cc63bfcdf | ||
|
|
78f3c6c592 | ||
|
|
ae5d3f1fb3 | ||
|
|
83b1321d85 | ||
|
|
8dd56b3d2a | ||
|
|
04f4c7ea87 | ||
|
|
ceb0db474a | ||
|
|
0ca38c047f | ||
|
|
d6edd0e679 | ||
|
|
116f808cba | ||
|
|
cc214b6b84 | ||
|
|
63b0dcaa58 | ||
|
|
7e28a40602 | ||
|
|
344ab18b3c | ||
|
|
e280fb4510 | ||
|
|
8e802ac217 | ||
|
|
d592f9a29d | ||
|
|
2062380094 | ||
|
|
90a1b75701 | ||
|
|
635436fe18 | ||
|
|
02385520ad | ||
|
|
2047dda743 | ||
|
|
3092376bfa | ||
|
|
693894fbbd | ||
|
|
57ec7cbf99 | ||
|
|
0bb9e619c9 | ||
|
|
d1b8650451 | ||
|
|
e26ff829cf | ||
|
|
c308d7ae53 | ||
|
|
78897de1cb | ||
|
|
00c22fc3d1 | ||
|
|
234f3fdb78 | ||
|
|
0f296ab6aa | ||
|
|
866bf87b2d | ||
|
|
e2362a9dc6 | ||
|
|
b8811902c3 | ||
|
|
e1d8717509 | ||
|
a1668491c5 |
||
|
|
e29fc65177 |
||
|
|
bd33330127 | ||
|
2e7ed9b406 |
||
|
|
b0ca66af3b | ||
|
|
aef20c8714 |
18 changed files with 499 additions and 752 deletions
15
.gitignore
vendored
15
.gitignore
vendored
|
|
@ -9,5 +9,18 @@ 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
|
||||
/ij154c-src.zip
|
||||
/ij154d-src.zip
|
||||
/ij154e-src.zip
|
||||
/ij154f-src.zip
|
||||
/ij154g-src.zip
|
||||
/ij154h-src.zip
|
||||
/ij154i-src.zip
|
||||
/ij154k-src.zip
|
||||
/ij154m-src.zip
|
||||
/ij154n-src.zip
|
||||
/ij154p-src.zip
|
||||
/ij154r-src.zip
|
||||
|
|
|
|||
7
DISCLAIMER
Normal file
7
DISCLAIMER
Normal file
|
|
@ -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.
|
||||
192
changelog
Normal file
192
changelog
Normal file
|
|
@ -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
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -up ./source/build.xml.patch0 ./source/build.xml
|
||||
--- ./source/build.xml.patch0 2008-06-09 11:47:52.000000000 +0200
|
||||
+++ ./source/build.xml 2009-11-15 17:47:01.731056352 +0100
|
||||
@@ -19,8 +19,8 @@
|
||||
<copy file="IJ_Props.txt" todir="build" />
|
||||
<copy file="images/microscope.gif" tofile="build/microscope.gif" />
|
||||
<copy file="images/about.jpg" tofile="build/about.jpg" />
|
||||
- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
- <copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" />
|
||||
+ <!--<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
+ <copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> -->
|
||||
<copy todir="build/macros"><fileset dir="macros"/></copy>
|
||||
<!-- Build ij.jar. -->
|
||||
<jar jarfile="ij.jar" basedir="build"
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
diff -up .find ./imagej.sh.patch1 ./imagej.sh
|
||||
--- ./imagej.sh.patch1 2009-11-16 17:24:43.486407325 +0100
|
||||
+++ ./imagej.sh 2009-11-16 17:29:56.947412083 +0100
|
||||
@@ -6,50 +6,38 @@
|
||||
# This program is free software, but comes with no warrenty or guarantee
|
||||
# send bug reports or feedback to jjackson at familyjackson dot net
|
||||
# Author: Jon Jackson
|
||||
-# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
|
||||
-# $Revision: 51 $
|
||||
+# Maintainer : Fabien Georget for fedora
|
||||
+# Last modified date: 2009-11-18
|
||||
+# Revision: 52
|
||||
#
|
||||
-# INSTALLATION INSTRUCTIONS
|
||||
#
|
||||
### WARNING ###########################################################
|
||||
# This file must be edited with a program that supports unix new line characters
|
||||
# - it won't run if edited in 'Notepad' !
|
||||
#######################################################################
|
||||
|
||||
-# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
|
||||
-# 1) Save this script in the ImageJ directory as 'imagej'
|
||||
-# 2) Modify path variables according to your system
|
||||
-# 3) Give the new file execute permission
|
||||
-# 4) Be sure the 'imagej' wrapper is in the 'PATH'
|
||||
-
|
||||
# setup environment
|
||||
-set +u # don't give error for unset variables (matters for environment variables)
|
||||
+set +u
|
||||
+# don't give error for unset variables (matters for environment variables)
|
||||
shopt -s extglob # allow extended pattern matching
|
||||
|
||||
############ SITE SPECIFIC VARIABLES #########################
|
||||
# Trailing / is not required for path variables
|
||||
# IMAGEJ PATH - production installation
|
||||
-ij_path='/local/ImageJ'
|
||||
-# Path to ImageJ development installation
|
||||
-ij_path_dev='/home/jjackson/ImageJ'
|
||||
+ij_path='/usr/share/java'
|
||||
+#path to data files
|
||||
+ij_data_path='/usr/share/imagej'
|
||||
+# Path to user
|
||||
+ij_user_path="${HOME}/.imagej"
|
||||
# JAVA PATH
|
||||
-# assumes executable is ${java_home}/bin/java
|
||||
-# set java_home variables ='' to use JAVA_HOME environment variable
|
||||
-if [[ -d /usr/java/jdk1.5 ]] ; then
|
||||
- java_home='/usr/java/jdk1.5'
|
||||
-else
|
||||
- # Optionally specify java path for all available OS / architecture combinations
|
||||
- java_home_Linux="${ij_path}/jre"
|
||||
- java_home_Linux_x86_64="${ij_path}/jre64"
|
||||
- java_home_SunOS="${ij_path}/jre64"
|
||||
- #
|
||||
-fi
|
||||
-ijadmin=''
|
||||
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
|
||||
+# report bug to http://bugzilla.redhat.com/
|
||||
+ijadmin='Fedora project'
|
||||
# DOCUMENTATION URL
|
||||
doc_url='http://rsb.info.nih.gov/ij/'
|
||||
|
||||
# TEMP FOLDER
|
||||
-ij_tmp='/tmp/imagej'
|
||||
+ij_tmp="${HOME}/.imagej/tmp"
|
||||
# LOG FILE
|
||||
#ij_log="${ij_tmp}/log.txt"
|
||||
# default behaviour when an ImageJ window is already open
|
||||
@@ -84,26 +72,17 @@ declare -i mem
|
||||
declare -i max_mem
|
||||
declare -i free_mem
|
||||
|
||||
-java_home="${java_home:-$JAVA_HOME}"
|
||||
+java_path="${JAVA_HOME}/bin/java"
|
||||
|
||||
-if [[ "$OS" == 'SunOS' ]] ; then
|
||||
- java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_SunOS:-$java_home}"
|
||||
- max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- free_mem="max_mem"
|
||||
- mem=${free_mem}/2
|
||||
- if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
-elif [[ "$OS" == 'Linux' ]] ; then
|
||||
+if [[ "$OS" == 'Linux' ]] ; then
|
||||
if [[ "$processor" == 'x86_64' ]] ; then
|
||||
java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
|
||||
max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
mem=${free_mem}/3*2
|
||||
if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
else
|
||||
java_arch='-d32'
|
||||
- JAVA_HOME="${java_home_Linux:-$java_home}"
|
||||
max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
mem=${free_mem}/3*2
|
||||
@@ -112,16 +91,38 @@ elif [[ "$OS" == 'Linux' ]] ; then
|
||||
fi
|
||||
|
||||
|
||||
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line
|
||||
-# to point to tools.jar. The -compile switch will load tools.jar into the
|
||||
-# classpath and enable plugins to be compiled in imagej
|
||||
+# create plugins, macros, luts dirs
|
||||
+mkdir -p $ij_user_path/plugins
|
||||
+mkdir -p $ij_user_path/macros
|
||||
+mkdir -p $ij_user_path/luts
|
||||
|
||||
-if [[ -f "${ij_path}/tools.jar" ]] ; then
|
||||
- tools="${ij_path}/tools.jar"
|
||||
-else
|
||||
- tools=''
|
||||
+if [[ ! -d "$ij_tmp" ]] ; then
|
||||
+ mkdir -p "$ij_tmp"
|
||||
fi
|
||||
|
||||
+# makes symbolik links from shared plugins, macros and luts
|
||||
+
|
||||
+ls $ij_data_path/plugins | while read p ; do
|
||||
+ if [ ! -e "$ij_user_path/plugins/$p" ] ; then
|
||||
+ ln -s $ij_data_path/plugins/$p $ij_user_path/plugins/$p
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+ls $ij_data_path/macros | while read p; do
|
||||
+ if [ ! -e "$ij_user_path/macros/$p" ] ; then
|
||||
+ ln -s "$ij_data_path/macros/$p" "$ij_user_path/macros/$p"
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+ls $ij_data_path/luts | while read p ; do
|
||||
+ if [ ! -e "$ij_user_path/luts/$p" ] ; then
|
||||
+ ln -s $ij_data_path/luts/$p $ij_user_path/luts/$p
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+# enable plugins to be compiled with imageJ
|
||||
+tools="${JAVA_HOME}/../lib/tools.jar"
|
||||
+
|
||||
# End Site specific variables ---------------------------------------------------------
|
||||
|
||||
# other variables
|
||||
@@ -320,9 +321,9 @@ fi
|
||||
|
||||
# Resolving ij.jar path. If ij.jar is a symbolic link to ij_<version>.jar
|
||||
# this allows updating ij.jar without crashing running sessions
|
||||
-ij_jar_path=$(derefln ${ij_path}/ij.jar)
|
||||
+ij_jar_path=$(derefln ${ij_path}/ImageJ-1.43.jar)
|
||||
|
||||
-for mod_jar in ${ij_path}/lib/*jar ; do
|
||||
+for mod_jar in ${ij_path}/*jar ; do
|
||||
modules="${modules:-}${modules+:}$mod_jar"
|
||||
done
|
||||
modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
|
||||
@@ -470,9 +471,9 @@ if [[ "$portopen" == 'false' ]] ; then
|
||||
fi
|
||||
|
||||
if (( $verbosity > 0 )) ; then
|
||||
- echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
+ echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
fi
|
||||
|
||||
cd "$dir"
|
||||
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
exit 0
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff -up source/build.xml.patch0 source/build.xml
|
||||
--- source/build.xml.patch0 2010-06-15 12:13:20.000000000 +0200
|
||||
+++ source/build.xml 2010-10-25 21:28:07.410723744 +0200
|
||||
@@ -19,9 +19,9 @@
|
||||
<copy file="IJ_Props.txt" todir="build" />
|
||||
<copy file="images/microscope.gif" tofile="build/microscope.gif" />
|
||||
<copy file="images/about.jpg" tofile="build/about.jpg" />
|
||||
- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
+ <!-- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" />
|
||||
- <copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" />
|
||||
+ <copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" /> -->
|
||||
<copy todir="build/macros"><fileset dir="macros"/></copy>
|
||||
<!-- Build ij.jar. -->
|
||||
<jar jarfile="ij.jar" basedir="build"
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
diff -up ./imagej.sh.patch1 ./imagej.sh
|
||||
--- ./imagej.sh.patch1 2010-10-30 19:11:07.917624743 +0200
|
||||
+++ ./imagej.sh 2010-10-30 19:10:56.181785972 +0200
|
||||
@@ -6,50 +6,38 @@
|
||||
# This program is free software, but comes with no warrenty or guarantee
|
||||
# send bug reports or feedback to jjackson at familyjackson dot net
|
||||
# Author: Jon Jackson
|
||||
-# Last modified date: $Date: 2009/12/14 20:16:33 $
|
||||
-# $Revision: 1.1 $
|
||||
+# Maintainer : Fabien Georget for fedora
|
||||
+# Last modified date: 2010-10-30
|
||||
+# Revision: 53
|
||||
#
|
||||
-# INSTALLATION INSTRUCTIONS
|
||||
#
|
||||
### WARNING ###########################################################
|
||||
# This file must be edited with a program that supports unix new line characters
|
||||
# - it won't run if edited in 'Notepad' !
|
||||
#######################################################################
|
||||
|
||||
-# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
|
||||
-# 1) Save this script in the ImageJ directory as 'imagej'
|
||||
-# 2) Modify path variables according to your system
|
||||
-# 3) Give the new file execute permission
|
||||
-# 4) Be sure the 'imagej' wrapper is in the 'PATH'
|
||||
-
|
||||
# setup environment
|
||||
-set +u # don't give error for unset variables (matters for environment variables)
|
||||
+set +u
|
||||
+# don't give error for unset variables (matters for environment variables)
|
||||
shopt -s extglob # allow extended pattern matching
|
||||
|
||||
############ SITE SPECIFIC VARIABLES #########################
|
||||
# Trailing / is not required for path variables
|
||||
# IMAGEJ PATH - production installation
|
||||
-ij_path='/local/ImageJ'
|
||||
-# Path to ImageJ development installation
|
||||
-ij_path_dev='/home/jjackson/ImageJ'
|
||||
+ij_path='/usr/share/java'
|
||||
+#path to data files
|
||||
+ij_data_path='/usr/share/imagej'
|
||||
+# Path to user
|
||||
+ij_user_path="${HOME}/.imagej"
|
||||
# JAVA PATH
|
||||
-# assumes executable is ${java_home}/bin/java
|
||||
-# set java_home variables ='' to use JAVA_HOME environment variable
|
||||
-if [[ -d /usr/java/jdk1.5 ]] ; then
|
||||
- java_home='/usr/java/jdk1.5'
|
||||
-else
|
||||
- # Optionally specify java path for all available OS / architecture combinations
|
||||
- java_home_Linux="${ij_path}/jre"
|
||||
- java_home_Linux_x86_64="${ij_path}/jre64"
|
||||
- java_home_SunOS="${ij_path}/jre64"
|
||||
- #
|
||||
-fi
|
||||
-ijadmin=''
|
||||
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
|
||||
+# report bug to http://bugzilla.redhat.com/
|
||||
+ijadmin='Fedora project'
|
||||
# DOCUMENTATION URL
|
||||
doc_url='http://rsb.info.nih.gov/ij/'
|
||||
|
||||
# TEMP FOLDER
|
||||
-ij_tmp='/tmp/imagej'
|
||||
+ij_tmp="${HOME}/.imagej/tmp"
|
||||
# LOG FILE
|
||||
#ij_log="${ij_tmp}/log.txt"
|
||||
# default behaviour when an ImageJ window is already open
|
||||
@@ -84,26 +72,17 @@ declare -i mem
|
||||
declare -i max_mem
|
||||
declare -i free_mem
|
||||
|
||||
-java_home="${java_home:-$JAVA_HOME}"
|
||||
+java_path="${JAVA_HOME}/bin/java"
|
||||
|
||||
-if [[ "$OS" == 'SunOS' ]] ; then
|
||||
- java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_SunOS:-$java_home}"
|
||||
- max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- free_mem="max_mem"
|
||||
- mem=${free_mem}/2
|
||||
- if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
-elif [[ "$OS" == 'Linux' ]] ; then
|
||||
+if [[ "$OS" == 'Linux' ]] ; then
|
||||
if [[ "$processor" == 'x86_64' ]] ; then
|
||||
java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
|
||||
max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
mem=${free_mem}/3*2
|
||||
if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
else
|
||||
java_arch='-d32'
|
||||
- JAVA_HOME="${java_home_Linux:-$java_home}"
|
||||
max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
mem=${free_mem}/3*2
|
||||
@@ -112,16 +91,38 @@ elif [[ "$OS" == 'Linux' ]] ; then
|
||||
fi
|
||||
|
||||
|
||||
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line
|
||||
-# to point to tools.jar. The -compile switch will load tools.jar into the
|
||||
-# classpath and enable plugins to be compiled in imagej
|
||||
+# create plugins, macros, luts dirs
|
||||
+mkdir -p $ij_user_path/plugins
|
||||
+mkdir -p $ij_user_path/macros
|
||||
+mkdir -p $ij_user_path/luts
|
||||
|
||||
-if [[ -f "${ij_path}/tools.jar" ]] ; then
|
||||
- tools="${ij_path}/tools.jar"
|
||||
-else
|
||||
- tools=''
|
||||
+if [[ ! -d "$ij_tmp" ]] ; then
|
||||
+ mkdir -p "$ij_tmp"
|
||||
fi
|
||||
|
||||
+# makes symbolik links from shared plugins, macros and luts
|
||||
+
|
||||
+ls $ij_data_path/plugins | while read p ; do
|
||||
+ if [ ! -e "$ij_user_path/plugins/$p" ] ; then
|
||||
+ ln -s $ij_data_path/plugins/$p $ij_user_path/plugins/$p
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+ls $ij_data_path/macros | while read p; do
|
||||
+ if [ ! -e "$ij_user_path/macros/$p" ] ; then
|
||||
+ ln -s "$ij_data_path/macros/$p" "$ij_user_path/macros/$p"
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+ls $ij_data_path/luts | while read p ; do
|
||||
+ if [ ! -e "$ij_user_path/luts/$p" ] ; then
|
||||
+ ln -s $ij_data_path/luts/$p $ij_user_path/luts/$p
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+# enable plugins to be compiled with imageJ
|
||||
+tools="${JAVA_HOME}/../lib/tools.jar"
|
||||
+
|
||||
# End Site specific variables ---------------------------------------------------------
|
||||
|
||||
# other variables
|
||||
@@ -320,9 +321,9 @@ fi
|
||||
|
||||
# Resolving ij.jar path. If ij.jar is a symbolic link to ij_<version>.jar
|
||||
# this allows updating ij.jar without crashing running sessions
|
||||
-ij_jar_path=$(derefln ${ij_path}/ij.jar)
|
||||
+ij_jar_path=$(derefln ${ij_path}/imagej.jar)
|
||||
|
||||
-for mod_jar in ${ij_path}/lib/*jar ; do
|
||||
+for mod_jar in ${ij_path}/*jar ; do
|
||||
modules="${modules:-}${modules+:}$mod_jar"
|
||||
done
|
||||
modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
|
||||
@@ -470,9 +471,9 @@ if [[ "$portopen" == 'false' ]] ; then
|
||||
fi
|
||||
|
||||
if (( $verbosity > 0 )) ; then
|
||||
- echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
+ echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
fi
|
||||
|
||||
cd "$dir"
|
||||
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
exit 0
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff -up source/build.xml.patch0 source/build.xml
|
||||
--- source/build.xml.patch0 2010-06-15 12:13:20.000000000 +0200
|
||||
+++ source/build.xml 2010-10-25 21:28:07.410723744 +0200
|
||||
@@ -19,9 +19,9 @@
|
||||
<copy file="IJ_Props.txt" todir="build" />
|
||||
<copy file="images/microscope.gif" tofile="build/microscope.gif" />
|
||||
<copy file="images/about.jpg" tofile="build/about.jpg" />
|
||||
- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
+ <!-- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" />
|
||||
- <copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" />
|
||||
+ <copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" /> -->
|
||||
<copy todir="build/macros"><fileset dir="macros"/></copy>
|
||||
<!-- Build ij.jar. -->
|
||||
<jar jarfile="ij.jar" basedir="build"
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
diff -up ./imagej.sh.patch1 ./imagej.sh
|
||||
--- ./imagej.sh.patch1 2010-10-30 19:11:07.917624743 +0200
|
||||
+++ ./imagej.sh 2010-10-30 19:10:56.181785972 +0200
|
||||
@@ -6,50 +6,38 @@
|
||||
# This program is free software, but comes with no warrenty or guarantee
|
||||
# send bug reports or feedback to jjackson at familyjackson dot net
|
||||
# Author: Jon Jackson
|
||||
-# Last modified date: $Date: 2009/12/14 20:16:33 $
|
||||
-# $Revision: 1.1 $
|
||||
+# Maintainer : Fabien Georget for fedora
|
||||
+# Last modified date: 2010-10-30
|
||||
+# Revision: 53
|
||||
#
|
||||
-# INSTALLATION INSTRUCTIONS
|
||||
#
|
||||
### WARNING ###########################################################
|
||||
# This file must be edited with a program that supports unix new line characters
|
||||
# - it won't run if edited in 'Notepad' !
|
||||
#######################################################################
|
||||
|
||||
-# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
|
||||
-# 1) Save this script in the ImageJ directory as 'imagej'
|
||||
-# 2) Modify path variables according to your system
|
||||
-# 3) Give the new file execute permission
|
||||
-# 4) Be sure the 'imagej' wrapper is in the 'PATH'
|
||||
-
|
||||
# setup environment
|
||||
-set +u # don't give error for unset variables (matters for environment variables)
|
||||
+set +u
|
||||
+# don't give error for unset variables (matters for environment variables)
|
||||
shopt -s extglob # allow extended pattern matching
|
||||
|
||||
############ SITE SPECIFIC VARIABLES #########################
|
||||
# Trailing / is not required for path variables
|
||||
# IMAGEJ PATH - production installation
|
||||
-ij_path='/local/ImageJ'
|
||||
-# Path to ImageJ development installation
|
||||
-ij_path_dev='/home/jjackson/ImageJ'
|
||||
+ij_path='/usr/share/java'
|
||||
+#path to data files
|
||||
+ij_data_path='/usr/share/imagej'
|
||||
+# Path to user
|
||||
+ij_user_path="${HOME}/.imagej"
|
||||
# JAVA PATH
|
||||
-# assumes executable is ${java_home}/bin/java
|
||||
-# set java_home variables ='' to use JAVA_HOME environment variable
|
||||
-if [[ -d /usr/java/jdk1.5 ]] ; then
|
||||
- java_home='/usr/java/jdk1.5'
|
||||
-else
|
||||
- # Optionally specify java path for all available OS / architecture combinations
|
||||
- java_home_Linux="${ij_path}/jre"
|
||||
- java_home_Linux_x86_64="${ij_path}/jre64"
|
||||
- java_home_SunOS="${ij_path}/jre64"
|
||||
- #
|
||||
-fi
|
||||
-ijadmin=''
|
||||
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
|
||||
+# report bug to http://bugzilla.redhat.com/
|
||||
+ijadmin='Fedora project'
|
||||
# DOCUMENTATION URL
|
||||
doc_url='http://rsb.info.nih.gov/ij/'
|
||||
|
||||
# TEMP FOLDER
|
||||
-ij_tmp='/tmp/imagej'
|
||||
+ij_tmp="${HOME}/.imagej/tmp"
|
||||
# LOG FILE
|
||||
#ij_log="${ij_tmp}/log.txt"
|
||||
# default behaviour when an ImageJ window is already open
|
||||
@@ -84,26 +72,17 @@ declare -i mem
|
||||
declare -i max_mem
|
||||
declare -i free_mem
|
||||
|
||||
-java_home="${java_home:-$JAVA_HOME}"
|
||||
+java_path="${JAVA_HOME}/bin/java"
|
||||
|
||||
-if [[ "$OS" == 'SunOS' ]] ; then
|
||||
- java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_SunOS:-$java_home}"
|
||||
- max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- free_mem="max_mem"
|
||||
- mem=${free_mem}/2
|
||||
- if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
-elif [[ "$OS" == 'Linux' ]] ; then
|
||||
+if [[ "$OS" == 'Linux' ]] ; then
|
||||
if [[ "$processor" == 'x86_64' ]] ; then
|
||||
java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
|
||||
max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
mem=${free_mem}/3*2
|
||||
if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
else
|
||||
java_arch='-d32'
|
||||
- JAVA_HOME="${java_home_Linux:-$java_home}"
|
||||
max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
mem=${free_mem}/3*2
|
||||
@@ -112,16 +91,38 @@ elif [[ "$OS" == 'Linux' ]] ; then
|
||||
fi
|
||||
|
||||
|
||||
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line
|
||||
-# to point to tools.jar. The -compile switch will load tools.jar into the
|
||||
-# classpath and enable plugins to be compiled in imagej
|
||||
+# create plugins, macros, luts dirs
|
||||
+mkdir -p $ij_user_path/plugins
|
||||
+mkdir -p $ij_user_path/macros
|
||||
+mkdir -p $ij_user_path/luts
|
||||
|
||||
-if [[ -f "${ij_path}/tools.jar" ]] ; then
|
||||
- tools="${ij_path}/tools.jar"
|
||||
-else
|
||||
- tools=''
|
||||
+if [[ ! -d "$ij_tmp" ]] ; then
|
||||
+ mkdir -p "$ij_tmp"
|
||||
fi
|
||||
|
||||
+# makes symbolik links from shared plugins, macros and luts
|
||||
+
|
||||
+ls $ij_data_path/plugins | while read p ; do
|
||||
+ if [ ! -e "$ij_user_path/plugins/$p" ] ; then
|
||||
+ ln -s $ij_data_path/plugins/$p $ij_user_path/plugins/$p
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+ls $ij_data_path/macros | while read p; do
|
||||
+ if [ ! -e "$ij_user_path/macros/$p" ] ; then
|
||||
+ ln -s "$ij_data_path/macros/$p" "$ij_user_path/macros/$p"
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+ls $ij_data_path/luts | while read p ; do
|
||||
+ if [ ! -e "$ij_user_path/luts/$p" ] ; then
|
||||
+ ln -s $ij_data_path/luts/$p $ij_user_path/luts/$p
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+# enable plugins to be compiled with imageJ
|
||||
+tools="${JAVA_HOME}/../lib/tools.jar"
|
||||
+
|
||||
# End Site specific variables ---------------------------------------------------------
|
||||
|
||||
# other variables
|
||||
@@ -320,9 +321,9 @@ fi
|
||||
|
||||
# Resolving ij.jar path. If ij.jar is a symbolic link to ij_<version>.jar
|
||||
# this allows updating ij.jar without crashing running sessions
|
||||
-ij_jar_path=$(derefln ${ij_path}/ij.jar)
|
||||
+ij_jar_path=$(derefln ${ij_path}/imagej.jar)
|
||||
|
||||
-for mod_jar in ${ij_path}/lib/*jar ; do
|
||||
+for mod_jar in ${ij_path}/*jar ; do
|
||||
modules="${modules:-}${modules+:}$mod_jar"
|
||||
done
|
||||
modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
|
||||
@@ -470,9 +471,9 @@ if [[ "$portopen" == 'false' ]] ; then
|
||||
fi
|
||||
|
||||
if (( $verbosity > 0 )) ; then
|
||||
- echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
+ echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
fi
|
||||
|
||||
cd "$dir"
|
||||
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
exit 0
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff -u source/build.xml source.new/build.xml
|
||||
--- source/build.xml 2015-09-01 10:21:20.000000000 +0100
|
||||
+++ source.new/build.xml 2016-03-26 22:49:28.413386612 +0000
|
||||
@@ -19,8 +19,8 @@
|
||||
<copy file="IJ_Props.txt" todir="build" />
|
||||
<copy file="images/microscope.gif" tofile="build/microscope.gif" />
|
||||
<copy file="images/about.jpg" tofile="build/about.jpg" />
|
||||
- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
- <copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" />
|
||||
+ <!-- <copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" />
|
||||
+ <copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" /> -->
|
||||
<copy todir="build/macros"><fileset dir="macros"/></copy>
|
||||
<!-- Build ij.jar. -->
|
||||
<jar jarfile="ij.jar" basedir="build"
|
||||
Common subdirectories: source/.FBCLockFolder and source.new/.FBCLockFolder
|
||||
Common subdirectories: source/ij and source.new/ij
|
||||
Common subdirectories: source/images and source.new/images
|
||||
Common subdirectories: source/macros and source.new/macros
|
||||
Common subdirectories: source/plugins and source.new/plugins
|
||||
|
|
@ -158,10 +158,10 @@ diff -up ./imagej.sh.patch1 ./imagej.sh
|
|||
|
||||
if (( $verbosity > 0 )) ; then
|
||||
- echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
+ echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
+ echo ${JAVA_HOME}/bin/java -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
fi
|
||||
|
||||
cd "$dir"
|
||||
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
+eval "${JAVA_HOME}/bin/java -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
exit 0
|
||||
|
|
|
|||
12
imagej-1.53r-source-target-version.patch
Normal file
12
imagej-1.53r-source-target-version.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
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 09:01:12.038023625 -0400
|
||||
@@ -14,7 +14,7 @@
|
||||
<!-- First, ensure the build directory exists. -->
|
||||
<mkdir dir="${build.dir}" />
|
||||
<!-- Build everything; add debug="on" to debug -->
|
||||
- <javac srcdir="./ij" destdir="${build.dir}" optimize="on" source="1.6" target="1.6" debug="on" includeantruntime="false" encoding="utf-8">
|
||||
+ <javac srcdir="./ij" destdir="${build.dir}" optimize="on" source="1.8" target="1.8" debug="on" includeantruntime="false" encoding="utf-8">
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
160
imagej-1.53r-unix-script.patch
Normal file
160
imagej-1.53r-unix-script.patch
Normal file
|
|
@ -0,0 +1,160 @@
|
|||
diff -Naur old/imagej.sh new/imagej.sh
|
||||
--- 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 $
|
||||
#
|
||||
+# This version of the script was further modified by Fabien Georget for Fedora,
|
||||
+# 2010-10-30, and then by Benjamin Beasley for Fedora, 2022-05-30.
|
||||
+#
|
||||
# INSTALLATION INSTRUCTIONS
|
||||
#
|
||||
### WARNING ###########################################################
|
||||
@@ -29,27 +32,21 @@
|
||||
############ SITE SPECIFIC VARIABLES #########################
|
||||
# Trailing / is not required for path variables
|
||||
# IMAGEJ PATH - production installation
|
||||
-ij_path='/local/ImageJ'
|
||||
+ij_path='@JAVADIR@'
|
||||
# Path to ImageJ development installation
|
||||
-ij_path_dev='/home/jjackson/ImageJ'
|
||||
+# ij_path_dev='/home/jjackson/ImageJ'
|
||||
+# Path to installed data files
|
||||
+ij_data_path='@PKGDATADIR@'
|
||||
+# User directory
|
||||
+ij_user_path="${HOME}/.imagej"
|
||||
# JAVA PATH
|
||||
-# assumes executable is ${java_home}/bin/java
|
||||
-# set java_home variables ='' to use JAVA_HOME environment variable
|
||||
-if [[ -d /usr/java/jdk1.5 ]] ; then
|
||||
- java_home='/usr/java/jdk1.5'
|
||||
-else
|
||||
- # Optionally specify java path for all available OS / architecture combinations
|
||||
- java_home_Linux="${ij_path}/jre"
|
||||
- java_home_Linux_x86_64="${ij_path}/jre64"
|
||||
- java_home_SunOS="${ij_path}/jre64"
|
||||
- #
|
||||
-fi
|
||||
-ijadmin=''
|
||||
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
|
||||
+ijadmin='https://bugzilla.redhat.com/enter_bug.cgi?format=guided&product=Fedora'
|
||||
# DOCUMENTATION URL
|
||||
doc_url='http://rsb.info.nih.gov/ij/'
|
||||
|
||||
# TEMP FOLDER
|
||||
-ij_tmp='/tmp/imagej'
|
||||
+ij_tmp="${HOME}/.imagej/tmp"
|
||||
# LOG FILE
|
||||
#ij_log="${ij_tmp}/log.txt"
|
||||
# default behaviour when an ImageJ window is already open
|
||||
@@ -84,44 +81,57 @@
|
||||
declare -i max_mem
|
||||
declare -i free_mem
|
||||
|
||||
-java_home="${java_home:-$JAVA_HOME}"
|
||||
-
|
||||
-if [[ "$OS" == 'SunOS' ]] ; then
|
||||
- java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_SunOS:-$java_home}"
|
||||
- max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- free_mem="max_mem"
|
||||
- mem=${free_mem}/2
|
||||
+if [[ "$processor" == 'x86_64' ]] ; then
|
||||
+java_arch='-d64'
|
||||
+max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
+ free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
+ mem=${free_mem}/3*2
|
||||
if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
-elif [[ "$OS" == 'Linux' ]] ; then
|
||||
- if [[ "$processor" == 'x86_64' ]] ; then
|
||||
- java_arch='-d64'
|
||||
- JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
|
||||
- max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- mem=${free_mem}/3*2
|
||||
- if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
- else
|
||||
- java_arch='-d32'
|
||||
- JAVA_HOME="${java_home_Linux:-$java_home}"
|
||||
- max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
- mem=${free_mem}/3*2
|
||||
- if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
- fi
|
||||
+else
|
||||
+ java_arch='-d32'
|
||||
+max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
+ free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
|
||||
+ mem=${free_mem}/3*2
|
||||
+ if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
|
||||
fi
|
||||
|
||||
|
||||
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line
|
||||
-# to point to tools.jar. The -compile switch will load tools.jar into the
|
||||
-# classpath and enable plugins to be compiled in imagej
|
||||
+# Create plugins, macros, luts dirs
|
||||
+mkdir -p $ij_user_path/plugins
|
||||
+mkdir -p $ij_user_path/macros
|
||||
+mkdir -p $ij_user_path/luts
|
||||
|
||||
-if [[ -f "${ij_path}/tools.jar" ]] ; then
|
||||
- tools="${ij_path}/tools.jar"
|
||||
-else
|
||||
- tools=''
|
||||
+if [[ ! -d "$ij_tmp" ]] ; then
|
||||
+ mkdir -p "$ij_tmp"
|
||||
fi
|
||||
|
||||
+# Make symbolic links from shared plugins, macros and luts
|
||||
+for x in plugins macros luts
|
||||
+do
|
||||
+ # 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
|
||||
+tools="${JAVA_HOME}/../lib/tools.jar"
|
||||
+
|
||||
# End Site specific variables ---------------------------------------------------------
|
||||
|
||||
# other variables
|
||||
@@ -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
|
||||
-ij_jar_path=$(derefln ${ij_path}/ij.jar)
|
||||
+ij_jar_path="$(derefln "${ij_path}/imagej.jar")"
|
||||
|
||||
for mod_jar in ${ij_path}/lib/*jar ; do
|
||||
modules="${modules:-}${modules+:}$mod_jar"
|
||||
@@ -470,9 +480,9 @@
|
||||
fi
|
||||
|
||||
if (( $verbosity > 0 )) ; then
|
||||
- echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
+ echo ${JAVA_HOME}/bin/java -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
|
||||
fi
|
||||
|
||||
cd "$dir"
|
||||
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
+eval "${JAVA_HOME}/bin/java -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
|
||||
exit 0
|
||||
12
imagej-1.54g-do-not-copy-class-files.patch
Normal file
12
imagej-1.54g-do-not-copy-class-files.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
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" />
|
||||
<copy file="images/about.jpg" tofile="${build.dir}/about.jpg" />
|
||||
- <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. -->
|
||||
BIN
imagej.png
Normal file
BIN
imagej.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
276
imagej.spec
276
imagej.spec
|
|
@ -1,220 +1,136 @@
|
|||
Name: imagej
|
||||
Version: 1.50
|
||||
Release: 8.h%{?dist}
|
||||
Version: 1.54r
|
||||
Release: %autorelease
|
||||
Summary: Image Processing and Analysis in Java
|
||||
|
||||
License: Public Domain
|
||||
URL: http://rsbweb.nih.gov/ij/index.html
|
||||
Source0: http://rsbweb.nih.gov/ij/download/src/ij150h-src.zip
|
||||
Source1: %{name}.desktop
|
||||
Source2: http://rsbweb.nih.gov/ij/macros/macros.zip
|
||||
Source3: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
|
||||
# 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
|
||||
# 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
|
||||
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
|
||||
|
||||
# don't copy .class files
|
||||
patch0: %{name}-%{version}-patch0.patch
|
||||
# modify imagej.sh for fedora compatibility
|
||||
patch1: %{name}-%{version}-patch1.patch
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
# Do not copy class files.
|
||||
Patch1: imagej-1.54g-do-not-copy-class-files.patch
|
||||
# Modify imagej.sh (as intended by upstream) for Fedora compatibility.
|
||||
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: jpackage-utils
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-openjdk25
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: java-25-devel
|
||||
|
||||
Requires: jpackage-utils
|
||||
# java-devel not java for plugins build
|
||||
Requires: java-devel >= 1.6.0
|
||||
# Require java-devel, not only java, for plugins build
|
||||
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
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 and the linked
|
||||
# “packaging” mailing list discussion for similar issues in documentation
|
||||
# generated by Sphinx and Doxygen.
|
||||
Obsoletes: imagej-javadoc < 1.53r-1
|
||||
|
||||
%description
|
||||
ImageJ is a public domain Java image processing program. It can display,
|
||||
edit, analyze a wide variety of image data, including image sequences. Imagej
|
||||
can be used for quantitative analysis of engineering and scientific image data.
|
||||
ImageJ is a public domain Java image processing program. It can display, edit,
|
||||
analyze a wide variety of image data, including image sequences. Imagej can be
|
||||
used for quantitative analysis of engineering and scientific image data.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadocs for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -c -n "%{name}-%{version}"
|
||||
# patch build.xml
|
||||
%patch0 -p0 -b .patch0
|
||||
# unzip macros.zip
|
||||
unzip -qq -u %{SOURCE2}
|
||||
# erase binary and useless files
|
||||
rm -rf macros/.FBC*
|
||||
rm macros/build.xml
|
||||
rm -rf __MACOSX
|
||||
#get and patch unix-script.txt
|
||||
cp %{SOURCE3} ./imagej.sh
|
||||
%patch1 -p1 -b .patch1
|
||||
%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
|
||||
# Strip out any bundled pre-compiled class or jar files:
|
||||
find . \( -name '*.class' -o -name '*.jar' \) -print -delete
|
||||
# Fix permissions
|
||||
find macros -type d -exec chmod -v 0755 '{}' '+'
|
||||
find macros -type f -exec chmod -v 0644 '{}' '+'
|
||||
|
||||
%autopatch -p1
|
||||
# Replace placeholders in our patched unix-script.txt/imagej.sh.
|
||||
sed -r -i \
|
||||
-e 's#@JAVADIR@#%{_javadir}#' \
|
||||
-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
|
||||
|
||||
find -name '*.class' -exec rm -f '{}' \;
|
||||
find -name '*.jar' -exec rm -f '{}' \;
|
||||
|
||||
%build
|
||||
cd source
|
||||
ant build javadocs
|
||||
ant build
|
||||
cd ..
|
||||
|
||||
|
||||
%install
|
||||
|
||||
# install jar
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}
|
||||
cp -p source/ij.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||
|
||||
|
||||
# install javadoc
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -rp api \
|
||||
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
install -p -m 0644 -D source/ij.jar '%{buildroot}%{_javadir}/imagej.jar'
|
||||
|
||||
# install icon
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -D -p -m 0644 -t '%{buildroot}%{_datadir}/pixmaps' '%{SOURCE4}'
|
||||
|
||||
# install data files
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
cp -p source/build/about.jpg $RPM_BUILD_ROOT%{_datadir}/%{name}/about.jpg
|
||||
cp -p source/build/IJ_Props.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/IJ_Props.txt
|
||||
# install data files and macros
|
||||
install -D -p -m 0644 -t '%{buildroot}%{_datadir}/imagej' \
|
||||
source/build/about.jpg source/build/IJ_Props.txt
|
||||
cp -rvp macros '%{buildroot}%{_datadir}/imagej/'
|
||||
|
||||
#install macros
|
||||
chmod 644 macros/About\ Startup\ Macros
|
||||
find ./macros -name \*.txt -type f -exec chmod 644 {} \;
|
||||
find ./macros -type d -exec chmod 755 {} \;
|
||||
cp -rp macros $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
|
||||
|
||||
#install luts
|
||||
mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/luts
|
||||
# install directories for luts and plugins
|
||||
install -d '%{buildroot}%{_datadir}/imagej/luts' \
|
||||
'%{buildroot}%{_datadir}/imagej/plugins'
|
||||
# install -p -m 0644 source/plugins/JavaScriptEvaluator.source \
|
||||
# '%%{buildroot}%%{_datadir}/imagej/plugins/JavaScriptEvaluator.java'
|
||||
|
||||
# install script
|
||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||
chmod +x imagej.sh
|
||||
cp -p imagej.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
|
||||
|
||||
# directory for plugins
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
|
||||
#cp source/plugins/JavaScriptEvaluator.source $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/JavaScriptEvaluator.java
|
||||
install -D -p imagej.sh '%{buildroot}%{_bindir}/imagej'
|
||||
|
||||
# desktop file
|
||||
desktop-file-install --vendor="" \
|
||||
desktop-file-install --vendor='' \
|
||||
--dir=%{buildroot}%{_datadir}/applications/ \
|
||||
%{SOURCE1}
|
||||
|
||||
%files
|
||||
%{_javadir}/*
|
||||
%{_datadir}/%{name}/
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/pixmaps/imagej.png
|
||||
%{_bindir}/%{name}
|
||||
%doc source/aREADME.txt source/release-notes.html source/applet.html
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
%files
|
||||
%license DISCLAIMER
|
||||
%doc source/aREADME.txt source/release-notes.html
|
||||
|
||||
%{_javadir}/imagej.jar
|
||||
|
||||
%{_datadir}/imagej/
|
||||
%{_datadir}/applications/imagej.desktop
|
||||
%{_datadir}/pixmaps/imagej.png
|
||||
|
||||
%{_bindir}/imagej
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
|
|
|||
5
sources
5
sources
|
|
@ -1,3 +1,2 @@
|
|||
83c9714523c97a4e949171356c60706c ij150h-src.zip
|
||||
7bd89b6a211c26c5abd62791d1fad8b4 imagej.png
|
||||
8161ec95aa84e9fa3e46e68a00fada4d macros.zip
|
||||
SHA512 (ij154r-src.zip) = eca256a4de84d46830e27dc452816c4fb209d1e1a62e555cc3984f46bdc3341d6bd8c7edc39adbe0ff0710de6141a170c5402d125e31ba0194a61368f49e9698
|
||||
SHA512 (macros.zip) = 383dd4131c3bc9f810c297f2846105592bcf34a09cbaa590c5ffb8a71217bb6eba7b0cbab4ab259feb740ac87e05d439e19cfb17fc67c9150f60a1711657bfd3
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# This program is free software, but comes with no warrenty or guarantee
|
||||
# send bug reports or feedback to jjackson at familyjackson dot net
|
||||
# Author: Jon Jackson
|
||||
# Last modified date: $Date: 2009/12/14 20:16:33 $
|
||||
# $Revision: 1.1 $
|
||||
# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
|
||||
# $Revision: 51 $
|
||||
#
|
||||
# INSTALLATION INSTRUCTIONS
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue