[imagej] Update to 1.46d
verdurin
verdurin at fedoraproject.org
Wed Jan 11 13:39:16 UTC 2012
commit 59225163df5fdc04d4104a6314d595c211cffcf8
Author: Adam Huffman <verdurin at fedoraproject.org>
Date: Wed Jan 11 13:39:08 2012 +0000
Update to 1.46d
.gitignore | 1 +
imagej-1.46-patch0.patch | 15 ++++
imagej-1.46-patch1.patch | 167 ++++++++++++++++++++++++++++++++++++++++++++++
imagej.spec | 9 ++-
sources | 2 +-
5 files changed, 190 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6859b32..dbc5b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ macros.zip
/ij144h-src.zip
/macros.zip
/ij144i-src.zip
+/ij146d-src.zip
diff --git a/imagej-1.46-patch0.patch b/imagej-1.46-patch0.patch
new file mode 100644
index 0000000..beb69c5
--- /dev/null
+++ b/imagej-1.46-patch0.patch
@@ -0,0 +1,15 @@
+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"
diff --git a/imagej-1.46-patch1.patch b/imagej-1.46-patch1.patch
new file mode 100644
index 0000000..af455a7
--- /dev/null
+++ b/imagej-1.46-patch1.patch
@@ -0,0 +1,167 @@
+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
diff --git a/imagej.spec b/imagej.spec
index d7a8b59..6f2d7a4 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -1,12 +1,12 @@
Name: imagej
-Version: 1.44
-Release: 2.i%{?dist}
+Version: 1.46
+Release: 1.d%{?dist}
Summary: Image Processing and Analysis in Java
Group: Applications/Engineering
License: Public Domain
URL: http://rsbweb.nih.gov/ij/index.html
-Source0: http://rsbweb.nih.gov/ij/download/src/ij144i-src.zip
+Source0: http://rsbweb.nih.gov/ij/download/src/ij146d-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
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 11 2012 Adam Huffman <verdurin at fedoraproject.org> - 1.46-1.d
+- update to 1.45d
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.44-2.i
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index feb9765..36db2ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-13c40a15623082461890e5b6d9378a42 ij144i-src.zip
+4274105f3cb13d079d0000f6403d80c7 ij146d-src.zip
8161ec95aa84e9fa3e46e68a00fada4d macros.zip
More information about the scm-commits
mailing list