summaryrefslogtreecommitdiffstats
path: root/base/jdk
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-02-28 15:15:54 +0100
committertnut <thierryn1 at hispeed dot ch>2010-02-28 15:15:54 +0100
commit8d8306fa31394800a8b7975fe55896c07ddfc5bf (patch)
tree89699bc9b37bde72c65684294ad5fded4d780738 /base/jdk
parent598534eb2fc9fab1b4288194049d3e0ed81f7ca0 (diff)
downloadnutyx-extra-8d8306fa31394800a8b7975fe55896c07ddfc5bf.tar.gz
nutyx-extra-8d8306fa31394800a8b7975fe55896c07ddfc5bf.tar.bz2
nutyx-extra-8d8306fa31394800a8b7975fe55896c07ddfc5bf.tar.xz
nutyx-extra-8d8306fa31394800a8b7975fe55896c07ddfc5bf.zip
Maj jdk#6u18-2, ajout du lien plugin pour firefox
Diffstat (limited to 'base/jdk')
-rw-r--r--base/jdk/.footprint4
-rw-r--r--base/jdk/Pkgfile10
2 files changed, 12 insertions, 2 deletions
diff --git a/base/jdk/.footprint b/base/jdk/.footprint
index 5df3c8dfa..5eba8d93f 100644
--- a/base/jdk/.footprint
+++ b/base/jdk/.footprint
@@ -1492,6 +1492,10 @@ drwxr-xr-x root/root opt/jdk/lib/visualvm/visualvm/update_tracking/
-rw-r--r-- root/root opt/jdk/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-tools.xml
-rw-r--r-- root/root opt/jdk/src.zip
drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/firefox/
+drwxr-xr-x root/root usr/lib/firefox/plugins/
+lrwxrwxrwx root/root usr/lib/firefox/plugins/libnpjp2.so -> /opt/jdk/jre/lib/i386/libnpjp2.so
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile
index a500373d2..abdc1fa78 100644
--- a/base/jdk/Pkgfile
+++ b/base/jdk/Pkgfile
@@ -2,11 +2,10 @@
# URL: http://java.sun.com/javase/downloads/index.jsp
# Maintainer: NuTyX coreteam
# Packager: thierryn1 at hispeed dot ch
-# Depends on:
name=jdk
version=6u18
-release=1
+release=2
[ "`uname -m`" == "i686" ] && _ARCH=i586
[ "`uname -m`" == "x86_64" ] && _ARCH=amd64
@@ -41,4 +40,11 @@ build() {
$PKG/usr/share/man/man1/
rm -r $PKG/opt/jdk/jre/man
rm -r $PKG/usr/share/man/ja*
+ # Installation du plugin
+ mkdir -p $PKG/usr/lib/firefox/plugins
+ if [ ${_ARCH} = "i586" ]; then
+ ln -s /opt/jdk/jre/lib/i386/libnpjp2.so $PKG/usr/lib/firefox/plugins
+ else
+ ln -s /opt/jdk/jre/lib/amd64/libnpjp2.so $PKG/usr/lib/firefox/plugins
+ fi
}