[Lunar-commits] <moonbase> sun-jdk: updated to 1.6.0_13

[Zbigniew Luszpinski]

commit 351fec69692b6e03e9b41cf8548007dd0871a440
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Mar 27 15:25:07 2009 +0100

    sun-jdk: updated to 1.6.0_13
---
 compilers/sun-jdk/BUILD          |   14 +++++++-------
 compilers/sun-jdk/DETAILS        |   10 +++++-----
 compilers/sun-jdk/DETAILS.x86_64 |   10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index ff28021..d4e84aa 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -7,14 +7,14 @@
 
   prepare_install &&
 
-  cp -r $SOURCE_DIRECTORY/jdk${VERSION} /usr/lib/ &&
+  cp -r $SOURCE_DIRECTORY/jdk${FVERSION} /usr/lib/ &&
 
   # Some apps only search for java in /usr/java
   rm  -f /usr/java &&
-  ln -sf /usr/lib/jdk${VERSION} /usr/java &&
+  ln -sf /usr/lib/jdk${FVERSION} /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${FVERSION}/bin/*; do
       bfile=`basename $file`
       # Conflicting files with heimdal
       if [[ "$bfile" != "klist" ]] && [[ "$bfile" != "kinit" ]]; then
@@ -27,16 +27,16 @@
   rm -f /opt/lunar/plugins/libnpjp2.so &&
 
   if [ $NEWPLUGIN == 'y' ]; then
-  ln -sf /usr/lib/jdk${VERSION}/jre/lib/i386/libnpjp2.so \
+  ln -sf /usr/lib/jdk${FVERSION}/jre/lib/i386/libnpjp2.so \
          /opt/lunar/plugins/
   else
-  ln -sf /usr/lib/jdk${VERSION}/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+  ln -sf /usr/lib/jdk${FVERSION}/jre/plugin/i386/ns7/libjavaplugin_oji.so \
          /opt/lunar/plugins/
   fi &&
 
 
-  echo export PATH=\"'${PATH}':/usr/lib/jdk"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
-  echo export JAVA_HOME=\"/usr/lib/jdk"${VERSION}"/\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
+  echo export PATH=\"'${PATH}':/usr/lib/jdk"${FVERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
+  echo export JAVA_HOME=\"/usr/lib/jdk"${FVERSION}"/\" >> $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 69243b9..72f2d80 100644
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,13 +1,13 @@
           MODULE=sun-jdk
-         VERSION=1.6.0_12
-              SR=6u12
-          SOURCE=jdk-$SR-dlj-linux-i586.bin
+         VERSION=6u13
+         FVERSION=1.${VERSION/u/.0_}
+          SOURCE=jdk-$VERSION-dlj-linux-i586.bin
       SOURCE_URL=http://download.java.net/dlj/binaries/
-      SOURCE_VFY=sha1:bbbb8cd68fa206e85e78221f3600b41ceb306896
+      SOURCE_VFY=sha1:ef9177f519ad03669921876fd711c1c02f306abf
         WEB_SITE=https://jdk-distros.dev.java.net/developer.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20090208
+         UPDATED=20090327
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
diff --git a/compilers/sun-jdk/DETAILS.x86_64 b/compilers/sun-jdk/DETAILS.x86_64
index 6787d0c..69f1fc8 100644
--- a/compilers/sun-jdk/DETAILS.x86_64
+++ b/compilers/sun-jdk/DETAILS.x86_64
@@ -1,13 +1,13 @@
           MODULE=sun-jdk
-         VERSION=1.6.0_12
-              SR=6u12
-          SOURCE=jdk-$SR-dlj-linux-amd64.bin
+         VERSION=6u13
+        FVERSION=1.${VERSION/u/.0_}
+          SOURCE=jdk-$VERSION-dlj-linux-amd64.bin
       SOURCE_URL=http://download.java.net/dlj/binaries/
-      SOURCE_VFY=sha1:94fa867edbdb17391d8df4861af60d12a06d6429
+      SOURCE_VFY=sha1:70b412a12037e3a9033503a566585d08418f029c
         WEB_SITE=https://jdk-distros.dev.java.net/developer.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20090208
+         UPDATED=20090327
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"