[Lunar-commits] <moonbase> sun-jdk: updated to 1.6.0_06 added ln /usr/java

[Zbigniew Luszpinski]

commit 1e63e0db478dbad6878f5e60e87a44bf3c42f479
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Apr 20 21:58:04 2008 +0200

    sun-jdk: updated to 1.6.0_06 added ln /usr/java
    to be compatibile with some apps.
---
 compilers/sun-jdk/BUILD     |    9 ++++++---
 compilers/sun-jdk/CONFLICTS |    2 +-
 compilers/sun-jdk/DETAILS   |   10 ++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index 629ffdc..1cb939d 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -1,14 +1,17 @@
 (
-  
+
   chmod +x $SOURCE &&
   ./$SOURCE --accept-license --unpack &&
 
-  prepare_install  &&
+  prepare_install &&
 
   cp -r $SOURCE_DIRECTORY/jdk${VERSION} /usr/lib/ &&
 
+  # Some apps only search for java in /usr/java
+  ln -sf /usr/lib/jdk${VERSION} /usr/java &&
+
   # Some applications don't accept anything but /usr/bin
-  for file in /usr/lib/jdk${VERSION}/bin/*; do 
+  for file in /usr/lib/jdk${VERSION}/bin/*; do
       bfile=`basename $file`
       # Conflicting files with heimdal
       if [[ "$bfile" != "klist" ]] && [[ "$bfile" != "kinit" ]]; then
diff --git a/compilers/sun-jdk/CONFLICTS b/compilers/sun-jdk/CONFLICTS
index 1e1bd4e..b4a2503 100644
--- a/compilers/sun-jdk/CONFLICTS
+++ b/compilers/sun-jdk/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts j2sdk &&
+conflicts j2sdk
 conflicts sun-jre
diff --git a/compilers/sun-jdk/DETAILS b/compilers/sun-jdk/DETAILS
index fa328dd..6adf7fe 100644
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,17 +1,15 @@
           MODULE=sun-jdk
-         VERSION=1.6.0_05
-          SOURCE=jdk-6u5-dlj-linux-i586.bin
+         VERSION=1.6.0_06
+          SOURCE=jdk-6u6-dlj-linux-i586.bin
       SOURCE_URL=http://download.java.net/dlj/binaries/
-      SOURCE_VFY=sha1:ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542
+      SOURCE_VFY=sha1:a14c3003425b99ca2b89ebf7a82a8a33b0139894
         WEB_SITE=https://jdk-distros.dev.java.net/developer.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20080326
+         UPDATED=20080419
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
 cat << EOF
 sun-jdk is a full features Java SDK including a Java runtime environment.
 EOF
-
-