- standarized JAVA_HOME, Requires: jdk

- added standard JAVA_HOME detection to ANT_HOME patch

Changed files:
    ant.spec -> 1.11
    jakarta-ant-ANT_HOME.patch -> 1.2

diff --git a/ant.spec b/ant.spec
index 8daa8ba2713c07eb084158b920fd2e73c2108dd4..f2e8b32c67f5bee0875e364ee7046e3b0d3b4e39 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -10,6 +10,7 @@ Source1:      http://jakarta.apache.org/builds/%{name}/release/v%{version}/bin/%{name
 Patch0:                %{name}-ANT_HOME.patch
 URL:           http://jakarta.apache.org/ant/
 BuildRequires: jdk
+Requires:      jdk
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,13 +43,11 @@ w Javie.
 %patch0 -p1
 
 %build
-if [ ! `echo $JAVA_HOME` ]; then 
-       echo "You haven't JAVA_HOME variable set. Can't continue."
-       exit 1
+if [ -z "$JAVA_HOME" ]; then
+       JAVA_HOME=/usr/lib/java
 fi
-
 CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:%{SOURCE1}"
-export CLASSPATH
+export JAVA_HOME CLASSPATH
 
 cp -f %{SOURCE1} .
 sh build.sh

diff --git a/jakarta-ant-ANT_HOME.patch b/jakarta-ant-ANT_HOME.patch
index 1d41720e96a23b39c477437b1ff80c08cf26045f..d1a0c28924b6137e6e7f71496a24d8c7ff33f0a3 100644 (file)
--- a/jakarta-ant-ANT_HOME.patch
+++ b/jakarta-ant-ANT_HOME.patch
@@ -28,3 +28,14 @@
  fi
  
  # For Cygwin, ensure paths are in UNIX format before anything is touched
+@@ -50,6 +50,10 @@
+     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+ fi
+ 
++if [ -z "$JAVA_HOME" -a -x /usr/lib/java/bin/java ]; then
++      JAVA_HOME=/usr/lib/java
++fi
++
+ if [ -z "$JAVACMD" ] ; then 
+   if [ -n "$JAVA_HOME"  ] ; then
+     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then