[arch-commits] CVS update of extra/devel/jdk (PKGBUILD)

[Jason Chu]

    Date: Friday, June 15, 2007 @ 13:45:04
  Author: jason
    Path: /home/cvs-extra/extra/devel/jdk

Modified: PKGBUILD (1.11 -> 1.12)

upgpkg: jdk 6u1-1


----------+
 PKGBUILD |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


Index: extra/devel/jdk/PKGBUILD
diff -u extra/devel/jdk/PKGBUILD:1.11 extra/devel/jdk/PKGBUILD:1.12
--- extra/devel/jdk/PKGBUILD:1.11	Thu Apr  5 19:20:27 2007
+++ extra/devel/jdk/PKGBUILD	Fri Jun 15 13:45:01 2007
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD,v 1.11 2007/04/05 23:20:27 andyrtr Exp $
+# $Id: PKGBUILD,v 1.12 2007/06/15 17:45:01 jason Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=jdk
 pkgver=6u1
 pkgrel=1
-force=y
 pkgdesc="Sun's Java Development Kit"
 arch=(i686 x86_64)
   [ "${CARCH}" = "i686" ]   && ARCH=i586
@@ -12,11 +11,10 @@
 url="http://java.sun.com"
 depends=('gcc' 'glibc' 'jre')
 install="jdk.install"
-source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-linux-${ARCH}.bin
+source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${ARCH}.sh
         https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
 	jdk.profile)
-md5sums=('f4481c4e064cec06a65d7751d9105c6d' '94065b612df0046d9ae758943f9f6a75'\
-         '4ba4fcd3825c7517179c315df5b63123')
+md5sums=('644a588f1ea9417fbf23b3e5505bbf8c' '94065b612df0046d9ae758943f9f6a75' '4ba4fcd3825c7517179c315df5b63123')
 [ "${CARCH}" = "x86_64" ] && md5sums=('ca82b347ac5a3153cefe5de34f968258' '94065b612df0046d9ae758943f9f6a75'\
          '4ba4fcd3825c7517179c315df5b63123')
 replaces=('j2sdk')
@@ -29,14 +27,13 @@
   mkdir unbundle-jdk
   cd unbundle-jdk
 
-  sh ../jdk-${pkgver}-linux-${ARCH}.bin --accept-license
+  sh ../jdk-${pkgver}-dlj-linux-${ARCH}.sh --accept-license
 
   cd ..
 
   sh construct.sh unbundle-jdk linux-jdk linux-jre
 
   rm -rf linux-jdk/jre
-  rm linux-jdk/src.zip
 
   mkdir -p ${startdir}/pkg/opt
   mv linux-jdk ${startdir}/pkg/opt/java