[imagej] mockbuild passed for this version
Fabien Georget
manawy at fedoraproject.org
Mon Oct 25 19:37:28 UTC 2010
commit 64a69f3a2ab978f4764dbe60eae189261680eb51
Author: manawy <manawy at fedoraproject.org>
Date: Mon Oct 25 21:36:02 2010 +0200
mockbuild passed for this version
imagej-1.44-patch0.patch | 15 +++---
imagej-1.44-patch1.patch | 109 ++-------------------------------------------
imagej.spec | 4 +-
3 files changed, 15 insertions(+), 113 deletions(-)
---
diff --git a/imagej-1.44-patch0.patch b/imagej-1.44-patch0.patch
index bf368c1..beb69c5 100644
--- a/imagej-1.44-patch0.patch
+++ b/imagej-1.44-patch0.patch
@@ -1,14 +1,15 @@
-diff -up ./source/build.xml.patch0 ./source/build.xml
---- ./source/build.xml.patch0 2010-09-28 20:40:51.481574104 +0200
-+++ ./source/build.xml 2010-09-28 20:41:06.019566895 +0200
-@@ -19,8 +19,8 @@
+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/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 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.44-patch1.patch b/imagej-1.44-patch1.patch
index 3d1c4b7..2a1ebfc 100644
--- a/imagej-1.44-patch1.patch
+++ b/imagej-1.44-patch1.patch
@@ -1,12 +1,12 @@
-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
+diff -up ./imagej.sh.patch1 ./imagej.sh
+--- ./imagej.sh.patch1 2010-10-25 21:21:18.000000000 +0200
++++ ./imagej.sh 2010-10-25 21:23:00.856473774 +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: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
--# $Revision: 51 $
+-# Last modified date: $Date: 2009/12/14 20:16:33 $
+-# $Revision: 1.1 $
+# Maintainer : Fabien Georget for fedora
+# Last modified date: 2009-11-18
+# Revision: 52
@@ -66,102 +66,3 @@ diff -up .find ./imagej.sh.patch1 ./imagej.sh
# 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
diff --git a/imagej.spec b/imagej.spec
index 1339b76..a992f08 100644
--- a/imagej.spec
+++ b/imagej.spec
@@ -46,9 +46,9 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -c -n "%{name}-%{version}"
# patch build.xml
-%patch0 -b .patch0
+%patch0 -p0 -b .patch0
# unzip macros.zip
-unzip -u %{SOURCE2}
+unzip -qq -u %{SOURCE2}
# erase binary and useless files
rm -rf macros/.FBC*
rm macros/build.xml
More information about the scm-commits
mailing list