[Lunar-commits] <moonbase> sun-jre: updated to 6u21 Fixed build: since now recommended and default /usr/java is used. Also all symlinks: latest and default are correctly set. Web browsers will always use latest release. Since now we are 100% compatibile with how Sun installs java using rpm.

[Zbigniew Luszpinski]

commit b1ecfeb7408b77a481a76b4cece5d74a20a10bbd
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Jul 18 18:15:40 2010 +0200

    sun-jre: updated to 6u21
    Fixed build: since now recommended and default /usr/java is used.
    Also all symlinks: latest and default are correctly set.
    Web browsers will always use latest release.
    Since now we are 100% compatibile with how Sun installs java using rpm.
---
 compilers/sun-jre/BUILD          |   26 ++++++++++++++++++--------
 compilers/sun-jre/DETAILS        |    8 ++++----
 compilers/sun-jre/DETAILS.x86_64 |    8 ++++----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index f9657c4..3f6105f 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -5,28 +5,38 @@
 
   # Clean up old java 1.6.0 service packs
   rm -rf /usr/lib/j[rd][ek]1.6.0_* &&
+  rm -rf /usr/java &&
+  mkdir -p /usr/java &&
 
   prepare_install  &&
 
-  cp -r $SOURCE_DIRECTORY/jre${FVERSION} /usr/lib &&
+  # This is default and recommended installation place for Java from Sun
+  cp -r $SOURCE_DIRECTORY/jre${FVERSION} /usr/java &&
+  # Sun's recommended symlinks:
+  # This one _always_ points on latest Java release
+  ln -sf /usr/java/jre${FVERSION} /usr/java/latest &&
+  # This one _always_ points on default Java.
+  # If not set manually by root it defaults to /usr/java/latest:
+  if [ ! -h /usr/java/default ]; then
+     ln -sf /usr/java/latest /usr/java/default
+  fi &&
 
-  # Some apps only search for java in /usr/java
-  rm -rf /usr/java &&
-  ln -sf /usr/lib/jre${FVERSION} /usr/java &&
+  # Some apps only search for java in /usr/lib
+  ln -sf /usr/java/jre${FVERSION} /usr/lib/jre${FVERSION} &&
 
   mkdir -p /opt/lunar/plugins &&
   rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
 
   if [ $NEWPLUGIN == 'y' ]; then
-  ln -sf /usr/lib/jre${FVERSION}/lib/i386/libnpjp2.so \
+  ln -sf /usr/java/latest/lib/i386/libnpjp2.so \
          /opt/lunar/plugins/
   else
-  ln -sf /usr/lib/jre${FVERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
+  ln -sf /usr/java/latest/plugin/i386/ns7/libjavaplugin_oji.so \
          /opt/lunar/plugins/
   fi &&
 
-  echo export PATH=\"'${PATH}':/usr/lib/jre"${FVERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
-  echo export JAVA_HOME=\"'${JAVA_HOME}':/usr/lib/jre"${FVERSION}"/\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
+  echo export JAVA_HOME=\"/usr/java/latest\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
+  echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
   install -m644 $SOURCE_DIRECTORY/sun-jre.rc /etc/profile.d/
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/sun-jre/DETAILS b/compilers/sun-jre/DETAILS
index 536c2ef..95600c5 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,13 +1,13 @@
           MODULE=sun-jre
-         VERSION=6u20
+         VERSION=6u21
         FVERSION=1.${VERSION/u/.0_}
           SOURCE=jre-$VERSION-linux-i586.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=39485&/"
-      SOURCE_VFY=sha1:dc650aeebbf0fb046061b42423d20ca3bc7f293e
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=40907&/"
+      SOURCE_VFY=sha1:22373a2e86cce53536a4c801d5b128a106cd3eaf
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20100420
+         UPDATED=20100718
            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 ba83c9d..be5da7b 100644
--- a/compilers/sun-jre/DETAILS.x86_64
+++ b/compilers/sun-jre/DETAILS.x86_64
@@ -1,13 +1,13 @@
           MODULE=sun-jre
-         VERSION=6u20
+         VERSION=6u21
         FVERSION=1.${VERSION/u/.0_}
           SOURCE=jre-$VERSION-linux-x64.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=39489&/"
-      SOURCE_VFY=sha1:65609d243cfe4f6572adbb4db0f2666f551a4b31
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=40911&/"
+      SOURCE_VFY=sha1:6ad666f9230e06312e32ef0d5680975309cf538b
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20100420
+         UPDATED=20100718
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"