[arch-commits] Commit in jre/repos (4 files)

[Eduardo Romero]

    Date: Friday, July 4, 2008 @ 11:05:34
  Author: eduardo
Revision: 4141

Merged revisions 2-4139 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/jre/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1436 | jason | 2008-05-08 11:45:50 -0400 (Thu, 08 May 2008) | 1 line
  
  updated jre to 6u6
........
  r4115 | eduardo | 2008-07-03 17:39:16 -0400 (Thu, 03 Jul 2008) | 1 line
........
  r4116 | eduardo | 2008-07-03 18:51:50 -0400 (Thu, 03 Jul 2008) | 1 line
........
  r4132 | eduardo | 2008-07-04 01:01:07 -0400 (Fri, 04 Jul 2008) | 1 line
........
  r4139 | eduardo | 2008-07-04 10:56:16 -0400 (Fri, 04 Jul 2008) | 2 lines
  
  upgpkg: jre 6u6-1
      Update to 6u6, cleared all bugs
........

Modified:
  jre/repos/extra-i686/	(properties)
  jre/repos/extra-i686/PKGBUILD
  jre/repos/extra-i686/jre.install
  jre/repos/extra-i686/jre.profile

-------------+
 PKGBUILD    |   10 +++++-----
 jre.install |    7 +++++++
 jre.profile |    4 +++-
 3 files changed, 15 insertions(+), 6 deletions(-)


Property changes on: jre/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /jre/trunk:1
   + /jre/trunk:1-4139

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-04 14:57:39 UTC (rev 4140)
+++ extra-i686/PKGBUILD	2008-07-04 15:05:34 UTC (rev 4141)
@@ -2,7 +2,7 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=jre
-pkgver=6u5
+pkgver=6u6
 pkgrel=1
 pkgdesc="Sun's java runtime environment"
 arch=(i686 x86_64)
@@ -12,9 +12,9 @@
 depends=('glibc' 'libstdc++5')
 install="jre.install"
 source=(http://download.java.net/dlj/binaries/jdk-$pkgver-dlj-linux-$_arch.bin https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh jre.profile)
-md5sums=('958f0b7e7465346e164770d360e60dd6'
+md5sums=('0efe7120ffb9a3379bc66d993056d80d'
          '94065b612df0046d9ae758943f9f6a75'
-         'c91ef2812b6554264f587f6b3035dbcc')
+         '7954eac1f4b3deb59d6af19ff50dfd68')
 replaces=('j2re')
 conflicts=('j2re' 'java-runtime')
 provides=('j2re' 'java-runtime')
@@ -39,8 +39,8 @@
 
   # no plugin for x86_64
   if [ "$CARCH" = "i686" ]; then
-    mkdir -p $startdir/pkg/opt/mozilla/lib/plugins
-    ln -s /opt/java/jre/plugin/i386/ns7/libjavaplugin_oji.so $startdir/pkg/opt/mozilla/lib/plugins
+    mkdir -p $startdir/pkg/usr/lib/mozilla/plugins
+    ln -s /opt/java/jre/plugin/i386/ns7/libjavaplugin_oji.so $startdir/pkg/usr/lib/mozilla/plugins
     else echo "no plugin for x86_64"
   fi
 

Modified: extra-i686/jre.install
===================================================================
--- extra-i686/jre.install	2008-07-04 14:57:39 UTC (rev 4140)
+++ extra-i686/jre.install	2008-07-04 15:05:34 UTC (rev 4141)
@@ -10,6 +10,13 @@
 		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
 	fi
 	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
+cat << _EOF
+
+==> In order to have java applets support in firefox you should install
+==> libxtst (pacman -S libxtst).
+
+_EOF
+
 }
 
 post_remove() {

Modified: extra-i686/jre.profile
===================================================================
--- extra-i686/jre.profile	2008-07-04 14:57:39 UTC (rev 4140)
+++ extra-i686/jre.profile	2008-07-04 15:05:34 UTC (rev 4141)
@@ -1,4 +1,6 @@
 export J2REDIR=/opt/java/jre
 export PATH=$PATH:$J2REDIR/bin
 export CLASSPATH=$CLASSPATH:$J2REDIR/lib
-export JAVA_HOME=/opt/java/jre
+if [ ! -f /etc/profile.d/jdk.sh ]; then
+        export JAVA_HOME=/opt/java/jre
+fi