[Lunar-commits] <moonbase> sun-jre: updated to 6u14 and build script rewrite

[Zbigniew Luszpinski]

commit fed7964dde423ffd30499e86c2b7adc39a65c534
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Jun 13 16:24:33 2009 +0200

    sun-jre: updated to 6u14 and build script rewrite
---
 compilers/sun-jre/BUILD          |   12 ++++++------
 compilers/sun-jre/DETAILS        |    8 ++++----
 compilers/sun-jre/DETAILS.x86_64 |    8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index 315d9a9..2013d81 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -1,21 +1,21 @@
 (
+
   chmod +x $SOURCE &&
-  ./$SOURCE --accept-license --unpack &&
+  echo "yes" | MORE="20000000" ./$SOURCE &&
 
   # Clean up old java 1.6.0 service packs
-  rm -rf /usr/lib/jre1.6.0_* &&
+  rm -rf /usr/lib/j[rd][ek]1.6.0_* &&
 
   prepare_install  &&
 
-  cp -r $SOURCE_DIRECTORY/jre${FVERSION} /usr/lib/ &&
+  cp -a $SOURCE_DIRECTORY/jre${FVERSION} /usr/lib &&
 
   # Some apps only search for java in /usr/java
-  rm  -f /usr/java &&
+  rm -rf /usr/java &&
   ln -sf /usr/lib/jre${FVERSION} /usr/java &&
 
   mkdir -p /opt/lunar/plugins &&
-  rm -f /opt/lunar/plugins/libjavaplugin_oji.so &&
-  rm -f /opt/lunar/plugins/libnpjp2.so &&
+  rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
 
   if [ $NEWPLUGIN == 'y' ]; then
   ln -sf /usr/lib/jre${FVERSION}/lib/i386/libnpjp2.so \
diff --git a/compilers/sun-jre/DETAILS b/compilers/sun-jre/DETAILS
index 1f57a08..f9ad59f 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,13 +1,13 @@
           MODULE=sun-jre
-         VERSION=6u13
+         VERSION=6u14
         FVERSION=1.${VERSION/u/.0_}
           SOURCE=jre-$VERSION-linux-i586.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=29210&/"
-      SOURCE_VFY=sha1:d9fb70c8ffcab972dd7fae1f343e59714aa67403
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=31611&/"
+      SOURCE_VFY=sha1:70275f262bd59106ded33126aa43fb3e41731c0d
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20090325
+         UPDATED=20090613
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
diff --git a/compilers/sun-jre/DETAILS.x86_64 b/compilers/sun-jre/DETAILS.x86_64
index 83d1048..9a6ced5 100644
--- a/compilers/sun-jre/DETAILS.x86_64
+++ b/compilers/sun-jre/DETAILS.x86_64
@@ -1,13 +1,13 @@
           MODULE=sun-jre
-         VERSION=6u13
+         VERSION=6u14
         FVERSION=1.${VERSION/u/.0_}
           SOURCE=jre-$VERSION-linux-x64.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=29214&/"
-      SOURCE_VFY=sha1:4d47a3b84ef851a5f32e3f1a213fc942f0ee8c0e
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=31615&/"
+      SOURCE_VFY=sha1:6919393cb8cffd49a454ce7bff3a2a9ed3b3ca6c
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20090325
+         UPDATED=20090613
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"