# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1332636858 -3600
# Node ID b22662429801007b4d0a61c7734c2d5c89e03613
# Parent  dedc7e272d02dbcc2b8bed600877d4d52496cdd2
gat-java6-jre: update JRE (1.6.0_31) + fix plugins install path

diff -r dedc7e272d02 -r b22662429801 get-java6-jre/receipt
--- a/get-java6-jre/receipt	Sat Mar 24 17:05:26 2012 +0100
+++ b/get-java6-jre/receipt	Sun Mar 25 01:54:18 2012 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="get-java6-jre"
-VERSION="1.0"
+VERSION="1.1"
 CATEGORY="non-free"
 SHORT_DESC="SUN Java Runtime"
 MAINTAINER="erjo@slitaz.org"
diff -r dedc7e272d02 -r b22662429801 get-java6-jre/stuff/get-java6-jre
--- a/get-java6-jre/stuff/get-java6-jre	Sat Mar 24 17:05:26 2012 +0100
+++ b/get-java6-jre/stuff/get-java6-jre	Sun Mar 25 01:54:18 2012 +0100
@@ -6,9 +6,9 @@
 # Author : Eric Joseph-Alexandre <erjo@slitaz.org>
 
 PACKAGE="java6-jre"
-VERSION="1.6.0_17"
+VERSION="1.6.0_31"
 URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=35675"
-TARBALL="jre-6u17-linux-i586.bin"
+TARBALL="jre-6u31-linux-i586.bin"
 TEMP_DIR="/tmp/$PACKAGE.$$"
 ROOT="$1"
 
@@ -75,8 +75,8 @@
 post_install()
 {
 	echo -n "Processing post install commands..."
-	cd /usr/lib/firefox*/plugins
-	ln -s /usr/lib/java/jre\$VERSION/plugin/i386/ns7/libjavaplugin_oji.so
+	 [ -d /usr/lib/mozilla/plugins ] || mkdir -p /usr/lib/mozilla/plugins 
+	ln -s /usr/lib/java/jre\$VERSION/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins
 
 	cd /usr/bin
 	ln -s /usr/lib/java/jre\$VERSION/bin/java 
@@ -85,7 +85,7 @@
 
 post_remove()
 {
-	rm -f /usr/lib/firefox*/plugins/libjavaplugin_oji.so
+	rm -f /usr/lib/mozilla/plugins/libnpjp2.so
 	rm -f /usr/bin/java
 }
 EOT