[Lunar-commits] <moonbase> sun-jre: added support for new java plugin for Firefox3. If you use other web browser keep using old plugin.

[Zbigniew Luszpinski]

commit 6089ebe31f01a6d0d9f0cfbac0c3bfee96a60966
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Nov 7 03:56:16 2008 +0100

    sun-jre: added support for new java plugin for Firefox3. If you use other web browser keep using old plugin.
---
 compilers/sun-jre/BUILD          |   14 ++++++++++++--
 compilers/sun-jre/CONFIGURE      |    1 +
 compilers/sun-jre/DETAILS        |   10 +++++-----
 compilers/sun-jre/DETAILS.x86_64 |   10 +++++-----
 compilers/sun-jre/POST_REMOVE    |    1 +
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index 5ef2c20..f976b41 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -6,11 +6,21 @@
 
   cp -r $SOURCE_DIRECTORY/jre${VERSION} /usr/lib/ &&
 
+  # Some apps only search for java in /usr/java
+  rm  -f /usr/java &&
+  ln -sf /usr/lib/jre${VERSION} /usr/java &&
+
   mkdir -p /opt/lunar/plugins &&
   rm -f /opt/lunar/plugins/libjavaplugin_oji.so &&
-  ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
-         /opt/lunar/plugins/ &&
+  rm -f /opt/lunar/plugins/libnpjp2.so &&
 
+  if [ $NEWPLUGIN == 'y' ]; then
+  ln -sf /usr/lib/jre${VERSION}/lib/i386/libnpjp2.so \
+         /opt/lunar/plugins/
+  else
+  ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
+         /opt/lunar/plugins/
+  fi &&
 
   echo export PATH=\"'${PATH}':/usr/lib/jre"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
   echo export JAVA_HOME=\"'${JAVA_HOME}':/usr/lib/jre"${VERSION}"/\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
diff --git a/compilers/sun-jre/CONFIGURE b/compilers/sun-jre/CONFIGURE
new file mode 100644
index 0000000..6b46697
--- /dev/null
+++ b/compilers/sun-jre/CONFIGURE
@@ -0,0 +1 @@
+ mquery NEWPLUGIN "Use new web browser plugin instead of old one ? (Yes if you use only firefox3 or need to run new applets)" n
diff --git a/compilers/sun-jre/DETAILS b/compilers/sun-jre/DETAILS
index 60e200f..fafc6c8 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,12 +1,12 @@
           MODULE=sun-jre
-         VERSION=1.6.0_07
-          SOURCE=jre-6u7-linux-i586.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=23103&/"
-      SOURCE_VFY=sha1:1ce17c0d18947971c09bf1c9c3f8c2dbcd777ff2
+         VERSION=1.6.0_10
+          SOURCE=jre-6u10-linux-i586.bin
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=25051&/"
+      SOURCE_VFY=sha1:dd4f5ad43e74340b485f3ca27512aeae84332931
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20080713
+         UPDATED=20081101
            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 c366d71..ee0a129 100644
--- a/compilers/sun-jre/DETAILS.x86_64
+++ b/compilers/sun-jre/DETAILS.x86_64
@@ -1,12 +1,12 @@
           MODULE=sun-jre
-         VERSION=1.6.0_07
-          SOURCE=jre-6u7-linux-x64.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=23105&/"
-      SOURCE_VFY=sha1:44031e0db246bbe4323428015195baa7e81a074a
+         VERSION=1.6.0_10
+          SOURCE=jre-6u10-linux-x64.bin
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=25053&/"
+      SOURCE_VFY=sha1:9de590f8a658312bc775017175aee93a952b9864
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20080713
+         UPDATED=20081101
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
diff --git a/compilers/sun-jre/POST_REMOVE b/compilers/sun-jre/POST_REMOVE
new file mode 100644
index 0000000..fa18104
--- /dev/null
+++ b/compilers/sun-jre/POST_REMOVE
@@ -0,0 +1 @@
+rm -rf /usr/lib/jre${VERSION}_*