From 27fd1b7398720960731b1dae029445ceba60be80 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Tue, 19 Jun 2007 04:22:58 +0000 Subject: [PATCH] Stefan Fiedler: update sun-jdk15{,-amd64} unpack all jar archives [2007041416540228302] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8560 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/java/sun-jdk15/sun-jdk15.conf | 6 +++--- package/java/sun-jdk15/sun-jdk15.desc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/java/sun-jdk15/sun-jdk15.conf b/package/java/sun-jdk15/sun-jdk15.conf index 2cf234c11..713406a9b 100644 --- a/package/java/sun-jdk15/sun-jdk15.conf +++ b/package/java/sun-jdk15/sun-jdk15.conf @@ -23,12 +23,12 @@ install_jdk () { if [[ "$xpkg" == *-amd64 ]] ; then - cp -a $archdir/jdk-${ver//./_}-distro-linux-amd64.bin java.bin + cp -a $archdir/jdk-${ver//./_}-dlj-linux-amd64.bin java.bin else - cp -a $archdir/jdk-${ver//./_}-distro-linux-i586.bin java.bin + cp -a $archdir/jdk-${ver//./_}-dlj-linux-i586.bin java.bin fi chmod +x java.bin - yes | ./java.bin + sh java.bin --accept-license --unpack cp -a -f jdk1.5* /opt JAVA_HOME="/opt/`ls -d jdk1.5*`" diff --git a/package/java/sun-jdk15/sun-jdk15.desc b/package/java/sun-jdk15/sun-jdk15.desc index 9126c516f..c6ef0cb50 100644 --- a/package/java/sun-jdk15/sun-jdk15.desc +++ b/package/java/sun-jdk15/sun-jdk15.desc @@ -44,13 +44,13 @@ [L] DLJ #[L] http://download.java.net/dlj/DLJ-v1.1.pdf [S] Stable -[V] 1.5.0_06 +[V] 1.5.0_11 [P] O -?---5---9 275.800 #if xpkg == sun-jdk15 -[D] 455901274 jdk-1_5_0_06-distro-linux-i586.bin http://download.java.net/dlj/binaries/ NODIST +[D] X jdk-1_5_0_11-distro-linux-i586.bin http://download.java.net/dlj/binaries/ NODIST #endif #if xpkg == sun-jdk15-amd64 -[D] 107540031 jdk-1_5_0_06-distro-linux-amd64.bin http://download.java.net/dlj/binaries/ NODIST +[D] X jdk-1_5_0_11-distro-linux-amd64.bin http://download.java.net/dlj/binaries/ NODIST #endif