[arch-commits] CVS update of extra/system/jre (PKGBUILD jre.profile)

[Jason Chu]

    Date: Sunday, March 30, 2008 @ 05:25:48
  Author: jason
    Path: /home/cvs-extra/extra/system/jre

Modified: PKGBUILD (1.15 -> 1.16) jre.profile (1.3 -> 1.4)

upgpkg: jre 6u5-1


-------------+
 PKGBUILD    |   21 ++++++++++++---------
 jre.profile |    4 +---
 2 files changed, 13 insertions(+), 12 deletions(-)


Index: extra/system/jre/PKGBUILD
diff -u extra/system/jre/PKGBUILD:1.15 extra/system/jre/PKGBUILD:1.16
--- extra/system/jre/PKGBUILD:1.15	Fri Jan 11 22:46:14 2008
+++ extra/system/jre/PKGBUILD	Sun Mar 30 05:25:48 2008
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD,v 1.15 2008/01/12 03:46:14 paul Exp $
+# $Id: PKGBUILD,v 1.16 2008/03/30 09:25:48 jason Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=jre
-pkgver=6u3
-pkgrel=2
+pkgver=6u5
+pkgrel=1
 pkgdesc="Sun's java runtime environment"
 arch=(i686 x86_64)
   [ "$CARCH" = "i686" ]   && _arch=i586
   [ "$CARCH" = "x86_64" ] && _arch=amd64
 url="http://java.sun.com"
-depends=('gcc' 'glibc' 'libstdc++5')
+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=('e39a322d8e3c89d3e679047cdeab50f7'
+md5sums=('958f0b7e7465346e164770d360e60dd6'
          '94065b612df0046d9ae758943f9f6a75'
-         '9f0fcd022119b7c00df93c09a7bb781a')
-[ "$CARCH" = "x86_64" ] && md5sums=('f0bf3837b2ba7965ad932e06321a172e'
-         '94065b612df0046d9ae758943f9f6a75'
-         '9f0fcd022119b7c00df93c09a7bb781a')
+         'c91ef2812b6554264f587f6b3035dbcc')
 replaces=('j2re')
 conflicts=('j2re' 'java-runtime')
 provides=('j2re' 'java-runtime')
+license=('custom')
 
 build() {
   cd $startdir/src
@@ -45,4 +43,9 @@
     ln -s /opt/java/jre/plugin/i386/ns7/libjavaplugin_oji.so $startdir/pkg/opt/mozilla/lib/plugins
     else echo "no plugin for x86_64"
   fi
+
+  mkdir -p $startdir/pkg/usr/share/licenses/jre
+  cp $startdir/pkg/opt/java/jre/COPYRIGHT $startdir/pkg/usr/share/licenses/jre
+  cp $startdir/pkg/opt/java/jre/LICENSE $startdir/pkg/usr/share/licenses/jre
+  cp $startdir/pkg/opt/java/jre/THIRDPARTYLICENSEREADME.txt $startdir/pkg/usr/share/licenses/jre
 }
Index: extra/system/jre/jre.profile
diff -u extra/system/jre/jre.profile:1.3 extra/system/jre/jre.profile:1.4
--- extra/system/jre/jre.profile:1.3	Sat Feb  2 13:48:35 2008
+++ extra/system/jre/jre.profile	Sun Mar 30 05:25:48 2008
@@ -1,6 +1,4 @@
 export J2REDIR=/opt/java/jre
 export PATH=$PATH:$J2REDIR/bin
 export CLASSPATH=$CLASSPATH:$J2REDIR/lib
-if [ ! -f /etc/profile.d/jdk.sh ]; then
-        export JAVA_HOME=/opt/java/jre
-fi
+export JAVA_HOME=/opt/java/jre