From 2ab2563b540cf6bf52d19d561f759c668aa1c970 Mon Sep 17 00:00:00 2001
From: Minto van der Sluis <misl@opensde.org>
Date: Sat, 4 Aug 2007 18:43:25 +0000
Subject: [PATCH] 	* updated sun-jre-142 (1.4.2_13 -> 1_4_2_15)

git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21934 10447126-35f2-4685-b0cf-6dd780d3921f
---
 java/sun-jre-142/java-sun-conf.in | 10 ++++++----
 java/sun-jre-142/sun-jre-142.desc |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/sun-jre-142/java-sun-conf.in b/java/sun-jre-142/java-sun-conf.in
index ed4bb3d21..24bea924a 100644
--- a/java/sun-jre-142/java-sun-conf.in
+++ b/java/sun-jre-142/java-sun-conf.in
@@ -1,8 +1,9 @@
 #!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../sun-jre-142/java-sun-conf.in
+# Filename: package/.../sun-jre-142/java-sun-conf.in
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2005 Clifford Wolf
 # 
@@ -12,7 +13,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 # Prevent normal package extraction. However since auto package
 # extraction is turned off, so are the pre and post patch hooks.
@@ -57,13 +58,14 @@ java_preconf() {
 	cp -v $java_srctar .
 	sed -i 's,more <<,cat <<,' ${java_srctar##*/}
 	sed -i 's,agreed=,agreed=1,' ${java_srctar##*/}
+	sed -i 's,`agree`,yes,' ${java_srctar##*/}
 
 	if [[ $pkg == *-150 ]]; then
 		patch -p0 ${java_srctar##*/} $confdir/../sun-jre-150/mime-type-remove.diff
 	fi
 
 	# Retrieve the original javahome name from the archive.
-	tempvar="`head -n15 ${java_srctar##*/} | grep javahome`"
+	tempvar="`head -n60 ${java_srctar##*/} | grep javahome`"
 	java_home_original=${tempvar/*=/}
 
 	# Ready to unpack/install the archive.
diff --git a/java/sun-jre-142/sun-jre-142.desc b/java/sun-jre-142/sun-jre-142.desc
index d90181cd5..6cb3bd7ae 100644
--- a/java/sun-jre-142/sun-jre-142.desc
+++ b/java/sun-jre-142/sun-jre-142.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
 [COPY] Filename: package/.../sun-jre-142/sun-jre-142.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] 
 [COPY] More information can be found in the files COPYING and README.
@@ -31,10 +31,10 @@
 
 [L] Restricted
 [S] Stable
-[V] 1.4.2_13
+[V] 1_4_2_15
 [P] O -----5---9 150.000
 
 [O] . $base/package/*/*/java-sun-conf.in jre
 
-[D] 2527223725 j2re-1_4_2_13-linux-i586.bin -manual://java.sun.com/j2se/1.4.2/download.html
+[D] 3249617932 j2re-1_4_2_15-linux-i586.bin -manual://java.sun.com/j2se/1.4.2/download.html