[Lunar-commits] <moonbase> sun-jdk: updated to 1.6.0_10 fixed build script

[Zbigniew Luszpinski]

commit cf905ded1ed4c60527eaf4deeb717c73b21f67fd
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Oct 19 01:49:46 2008 +0200

    sun-jdk: updated to 1.6.0_10 fixed build script
---
 compilers/sun-jdk/BUILD   |    6 +++++-
 compilers/sun-jdk/DETAILS |    9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index 8f9193b..fcc7946 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -3,11 +3,15 @@
   chmod +x $SOURCE &&
   ./$SOURCE --accept-license --unpack &&
 
+  # Clean up before install (fixes nested symlinks problem)
+  rm -rf /usr/lib/jdk1.6.0_*
+
   prepare_install &&
 
   cp -r $SOURCE_DIRECTORY/jdk${VERSION} /usr/lib/ &&
 
   # Some apps only search for java in /usr/java
+  rm  -f /usr/java &&
   ln -sf /usr/lib/jdk${VERSION} /usr/java &&
 
   # Some applications don't accept anything but /usr/bin
@@ -26,7 +30,7 @@
 
 
   echo export PATH=\"'${PATH}':/usr/lib/jdk"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
-  echo export JAVA_HOME=\"'${JAVA_HOME}':/usr/lib/jdk"${VERSION}"/\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
+  echo export JAVA_HOME=\"/usr/lib/jdk"${VERSION}"/\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
   install -m644 $SOURCE_DIRECTORY/sun-jdk.rc /etc/profile.d/
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/sun-jdk/DETAILS b/compilers/sun-jdk/DETAILS
index ade1745..c93297a 100644
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,12 +1,13 @@
           MODULE=sun-jdk
-         VERSION=1.6.0_07
-          SOURCE=jdk-6u7-dlj-linux-i586.bin
+         VERSION=1.6.0_10
+              SR=6u10
+          SOURCE=jdk-$SR-dlj-linux-i586.bin
       SOURCE_URL=http://download.java.net/dlj/binaries/
-      SOURCE_VFY=sha1:1a697ed721260331918fa34913203c78562d1d63
+      SOURCE_VFY=sha1:f4dc9d497042c5196afb7ae75257de8614673ea6
         WEB_SITE=https://jdk-distros.dev.java.net/developer.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20080713
+         UPDATED=20081018
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"