- updated to 1.5.1

Changed files:
    ant.spec -> 1.12
    jakarta-ant-ANT_HOME.patch -> 1.3

diff --git a/ant.spec b/ant.spec
index f2e8b32c67f5bee0875e364ee7046e3b0d3b4e39..03a05d7c7596cf21c409b3a7862dc8cff8af56e4 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -1,12 +1,11 @@
 Summary:       ant build tool for Java
 Summary(pl):   ant - narzêdzie do budowania w Javie
 Name:          jakarta-ant
-Version:       1.4.1
-Release:       4
+Version:       1.5.1
+Release:       1
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
-Source1:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/bin/%{name}-%{version}-optional.jar
 Patch0:                %{name}-ANT_HOME.patch
 URL:           http://jakarta.apache.org/ant/
 BuildRequires: jdk
@@ -46,10 +45,8 @@ w Javie.
 if [ -z "$JAVA_HOME" ]; then
        JAVA_HOME=/usr/lib/java
 fi
-CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:%{SOURCE1}"
-export JAVA_HOME CLASSPATH
+export JAVA_HOME
 
-cp -f %{SOURCE1} .
 sh build.sh
 
 %install

diff --git a/jakarta-ant-ANT_HOME.patch b/jakarta-ant-ANT_HOME.patch
index d1a0c28924b6137e6e7f71496a24d8c7ff33f0a3..0dca7a2e3764ec103de9ae07244e32a858390f7e 100644 (file)
--- a/jakarta-ant-ANT_HOME.patch
+++ b/jakarta-ant-ANT_HOME.patch
@@ -1,6 +1,7 @@
---- jakarta-ant-1.4.1/src/script/ant.wiget     Thu Oct 11 15:58:30 2001
-+++ jakarta-ant-1.4.1/src/script/ant   Thu Mar 21 15:02:29 2002
-@@ -14,13 +14,13 @@
+diff -urN jakarta-ant-1.5.1.org/src/script/ant jakarta-ant-1.5.1/src/script/ant
+--- jakarta-ant-1.5.1.org/src/script/ant       Wed Nov 27 00:01:16 2002
++++ jakarta-ant-1.5.1/src/script/ant   Wed Nov 27 00:06:27 2002
+@@ -35,13 +35,13 @@
  
  if [ -z "$ANT_HOME" ] ; then
    # try to find ANT
@@ -11,29 +12,29 @@
      ANT_HOME=/opt/ant
 -  fi
 -
--  if [ -d ${HOME}/opt/ant ] ; then 
-+  elif [ -d ${HOME}/opt/ant ] ; then 
-     ANT_HOME=${HOME}/opt/ant
+-  if [ -d "${HOME}/opt/ant" ] ; then 
++  elif [ -d "${HOME}/opt/ant" ] ; then 
+     ANT_HOME="${HOME}/opt/ant"
 -  fi
-+  else        
++  else
  
    ## resolve links - $0 may be a link to ant's home
-   PRG=$0
-@@ -37,7 +37,7 @@
-   done
-   
-   ANT_HOME=`dirname "$PRG"`/..
--
-+  fi
- fi
+   PRG="$0"
+@@ -65,6 +65,8 @@
  
- # For Cygwin, ensure paths are in UNIX format before anything is touched
-@@ -50,6 +50,10 @@
-     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+   cd "$saveddir"
+ 
++  fi
++
+   # make it fully qualified
+   ANT_HOME=`cd "$ANT_HOME" && pwd`
  fi
+@@ -82,6 +84,10 @@
+ # set ANT_LIB location
+ ANT_LIB="${ANT_HOME}/lib"
  
 +if [ -z "$JAVA_HOME" -a -x /usr/lib/java/bin/java ]; then
-+      JAVA_HOME=/usr/lib/java
++  JAVA_HOME=/usr/lib/java
 +fi
 +
  if [ -z "$JAVACMD" ] ; then