From d7ea043be68ccd8dd361a5d7a768386a2d8cc6e1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 16 Jul 2014 18:05:42 +0200 Subject: [PATCH] oracle-jdk: update to 8u11 (8u6 on arm) --- srcpkgs/oracle-jdk/template | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template index 16ac94e4d80..c0dd85416a1 100644 --- a/srcpkgs/oracle-jdk/template +++ b/srcpkgs/oracle-jdk/template @@ -1,8 +1,20 @@ # Template file for 'oracle-jdk' pkgname=oracle-jdk -version=8u5 -_longVersion=1.8.0_05 -revision=4 +case "${XBPS_TARGET_MACHINE}" in +armv*) + version=8u6 + _longVersion=1.8.0_06 + revision=1 + _build=23 + ;; +*) + version=8u11 + _longVersion=1.8.0_11 + revision=1 + _build=12 + ;; +esac + short_desc="Java Development Kit (JDK)" maintainer="Enno Boland " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" @@ -20,21 +32,21 @@ case "${XBPS_TARGET_MACHINE}" in x86_64) _arch=amd64 _filename=jdk-${version}-linux-x64.tar.gz - checksum="44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc" + checksum="f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9" ;; i686) _arch=i386 _filename=jdk-${version}-linux-i586.tar.gz - checksum="779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9" + checksum="3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1" ;; armv*) _arch=arm _filename=jdk-${version}-linux-arm-vfp-hflt.tar.gz - checksum="54e04ccf8383fb631b0c4a355e9136a05e53690b5caca52ef7581ae67e686179" + checksum="348252453db819a4cda146753b54b86ebd32191e47ff9f9be671e88aaf919d7c" ;; esac -distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b13/${_filename}" +distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/${_filename}" wrksrc="jdk$_longVersion" do_fetch() { @@ -68,7 +80,7 @@ do_install() { vmkdir "usr/share/java/$pkgname/jre" vinstall oracle-jdk-vars.sh 644 "usr/share/java" - vinstall LICENSE 644 "usr/share/licenses/${pkgname}" + vlicense LICENSE vinstall java-policy-settings.desktop 644 usr/share/applications ln -sr $DESTDIR/usr/share/java/$pkgname/jre $DESTDIR/usr/share/java/oracle-jre