# HG changeset patch
# User Paul Issott <paul@slitaz.org>
# Date 1226150232 0
# Node ID d732948e6b0be70e2731e336a6dc3af17c90fc82
# Parent  d84c7ed6eeb4cdc040ebc4e39b09ea2d38bbd761
Up: get-java6-jre - version 10

diff -r d84c7ed6eeb4 -r d732948e6b0b get-java6-jre/receipt
--- a/get-java6-jre/receipt	Sat Oct 25 12:09:31 2008 +0000
+++ b/get-java6-jre/receipt	Sat Nov 08 13:17:12 2008 +0000
@@ -5,14 +5,13 @@
 CATEGORY="non-free"
 SHORT_DESC="SUN Java Runtime"
 MAINTAINER="erjo@slitaz.org"
-DEPENDS=""
+DEPENDS="xorg-libXtst"
 WEB_SITE="http://www.java.com"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	install -o root -g root -m755 stuff/get-java6-jre.sh $fs/usr/bin
-	ln -s get-java6-jre.sh $fs/usr/bin/$PACKAGE
+	install -o root -g root -m755 stuff/get-java6-jre $fs/usr/bin
 }
 
diff -r d84c7ed6eeb4 -r d732948e6b0b get-java6-jre/stuff/get-java6-jre
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get-java6-jre/stuff/get-java6-jre	Sat Nov 08 13:17:12 2008 +0000
@@ -0,0 +1,96 @@
+#!/bin/sh 
+# Get and install the SUN Java Runtime Environnement
+#
+# (C) 2007-2008 SliTaz - GNU General Public License v3.
+#
+# Author : Eric Joseph-Alexandre <erjo@slitaz.org>
+
+PACKAGE="java6-jre"
+VERSION="1.6.0_10"
+URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=25051"
+TARBALL="jre-6u10-linux-i586.bin"
+TEMP_DIR="/tmp/$PACKAGE.$$"
+
+# Check if we are root starting anything
+if test $(id -u) != 0 ; then
+	echo -e "\nYou must be root to run `basename $0`."
+	echo -e "Please type 'su' and root password to become super-user.\n"
+	exit 1
+fi
+
+# Avoid reinstall
+if [ -d /var/lib/tazpkg/installed/$PACKAGE ]; then
+	echo -e "\n$PACKAGE package is already installed.\n"
+	exit 1
+fi
+
+
+
+# Create TEMP_DIR
+test -d $TEMP_DIR || mkdir $TEMP_DIR
+cd $TEMP_DIR
+
+# Doanload the file
+test -f $TARBALL || wget $URL -O $TARBALL
+
+# Do not trust 'df' free space
+sed -i 's/exit 3$//' $TARBALL
+
+# Run the install file user may agree to SUN EULA
+chmod +x  $TARBALL
+./${TARBALL}
+
+
+# Make the package
+mkdir -p $PACKAGE-$VERSION/fs/usr/lib/java 
+cp -a jre${VERSION} $PACKAGE-$VERSION/fs/usr/lib/java
+
+
+#delete unecessary files
+rm -rf $PACKAGE-$VERSION/fs/usr/lib/java/jre${VERSION}/man
+
+# Create receipt
+
+cat > $PACKAGE-$VERSION/receipt <<EOT
+# SliTaz package receipt.
+
+PACKAGE="$PACKAGE"
+VERSION="$VERSION"
+CATEGORY="non-free"
+SHORT_DESC="SUN Java Runtime."
+DEPENDS="xorg-libXtst"
+WEB_SITE="http://www.java.com/"
+
+post_install()
+{
+	echo -n "Processing post install commands..."
+	cd /usr/lib/firefox*/plugins
+	ln -s /usr/lib/java/jre\$VERSION/plugin/i386/ns7/libjavaplugin_oji.so
+
+	cd /usr/bin
+	ln -s /usr/lib/java/jre\$VERSION/bin/java 
+	status
+}
+
+post_remove()
+{
+	rm -f /usr/lib/firefox*/plugins/libjavaplugin_oji.so
+	rm -f /usr/bin/java
+}
+EOT
+
+# Pack
+tazpkg pack $PACKAGE-$VERSION
+
+# Install pseudo package
+tazpkg install $PACKAGE-$VERSION.tazpkg
+
+# Clean
+cd /tmp
+rm -rf $TEMP_DIR
+
+
+
+
+
+
diff -r d84c7ed6eeb4 -r d732948e6b0b get-java6-jre/stuff/get-java6-jre.sh
--- a/get-java6-jre/stuff/get-java6-jre.sh	Sat Oct 25 12:09:31 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-#!/bin/sh 
-# Get and install the SUN Java Runtime Environnement
-#
-# (C) 2007-2008 SliTaz - GNU General Public License v3.
-#
-# Author : Eric Joseph-Alexandre <erjo@slitaz.org>
-
-PACKAGE="java6-jre"
-VERSION="1.6.0_07"
-URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=23103"
-TARBALL="jre-6u7-linux-i586.bin"
-TEMP_DIR="/tmp/$PACKAGE.$$"
-
-# Check if we are root starting anything
-if test $(id -u) != 0 ; then
-	echo -e "\nYou must be root to run `basename $0`."
-	echo -e "Please type 'su' and root password to become super-user.\n"
-	exit 1
-fi
-
-# Avoid reinstall
-if [ -d /var/lib/tazpkg/installed/$PACKAGE ]; then
-	echo -e "\n$PACKAGE package is already installed.\n"
-	exit 1
-fi
-
-
-
-# Create TEMP_DIR
-test -d $TEMP_DIR || mkdir $TEMP_DIR
-cd $TEMP_DIR
-
-# Doanload the file
-test -f $TARBALL || wget $URL -O $TARBALL
-
-# Do not trust 'df' free space
-sed -i 's/exit 3$//' $TARBALL
-
-# Run the install file user may agree to SUN EULA
-chmod +x  $TARBALL
-./${TARBALL}
-
-
-# Make the package
-mkdir -p $PACKAGE-$VERSION/fs/usr/lib/java 
-cp -a jre${VERSION} $PACKAGE-$VERSION/fs/usr/lib/java
-
-
-#delete unecessary files
-rm -rf $PACKAGE-$VERSION/fs/usr/lib/java/jre${VERSION}/man
-
-# Create receipt
-
-cat > $PACKAGE-$VERSION/receipt <<EOT
-# SliTaz package receipt.
-
-PACKAGE="$PACKAGE"
-VERSION="$VERSION"
-CATEGORY="non-free"
-SHORT_DESC="SUN Java Runtime."
-DEPENDS=""
-WEB_SITE="http://www.java.com/"
-
-post_install()
-{
-	echo "Processing post install commands..."
-	for i in /usr/lib/firefox*; do
-		[ -d \$i ] || continue
-		cd \$i/plugins
-		ln -s /usr/lib/java/jre\$VERSION/plugin/i386/ns7/libjavaplugin_oji.so
-	done
-	
-	cd /usr/bin
-	ln -s /usr/lib/java/jre\$VERSION/bin/java 
-}
-
-post_remove()
-{
-	rm -f /usr/lib/firefox*/plugins/libjavaplugin_oji.so
-	rm -f /usr/bin/java
-}
-EOT
-
-# Pack
-tazpkg pack $PACKAGE-$VERSION
-
-# Install pseudo package
-tazpkg install $PACKAGE-$VERSION.tazpkg
-
-# Clean
-cd /tmp
-rm -rf $TEMP_DIR
-
-
-
-
-
-