[Lunar-commits] <moonbase> sun-jre: updated to 1.7.0
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Sat Sep 17 21:06:06 CEST 2011
commit 3bba97d9611a935992c257a904d59008468786ff
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Sat Sep 17 21:06:06 2011 +0200
sun-jre: updated to 1.7.0
---
compilers/sun-jre/BUILD | 39 ++++++++++++++++++++++------------
compilers/sun-jre/BUILD.x86_64 | 43 --------------------------------------
compilers/sun-jre/CONFLICTS | 2 +-
compilers/sun-jre/DETAILS | 17 ++++++++------
compilers/sun-jre/DETAILS.x86_64 | 17 ++++++++------
compilers/sun-jre/POST_REMOVE | 2 +-
compilers/sun-jre/PRE_BUILD | 4 ---
7 files changed, 47 insertions(+), 77 deletions(-)
diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index 4b2b5d7..eb73a3e 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -1,18 +1,16 @@
(
- chmod +x $SOURCE &&
- echo "yes" | MORE="20000000" ./$SOURCE &&
-
# Clean up old java 1.6.0 service packs
rm -rf /usr/lib/j[rd][ek]1.6.0_* &&
rm -rf /usr/java &&
rm -f /usr/lib/libjvm.so &&
- mkdir -p /usr/java &&
- prepare_install &&
+ prepare_install &&
- # This is default and recommended installation place for Java from Sun
- cp -r $SOURCE_DIRECTORY/jre${FVERSION} /usr/java &&
+ # Install java to right directory
+ mkdir -p /usr/java &&
+ # This is default and recommended installation place for Java
+ cp -r $SOURCE_DIRECTORY /usr/java &&
# Sun's recommended symlinks:
# This one _always_ points on latest Java release
ln -sf /usr/java/jre${FVERSION} /usr/java/latest &&
@@ -20,21 +18,34 @@
# If not set manually by root it defaults to /usr/java/latest:
if [ ! -h /usr/java/default ]; then
ln -sf /usr/java/latest /usr/java/default
- fi &&
+ fi &&
- # Some apps only search for java in /usr/lib
+ # Some dumb distros say java is only library so install it in /usr/lib
+ # We make symlink to help applications find java if they were developed in such ill environment
ln -sf /usr/java/jre${FVERSION} /usr/lib/jre${FVERSION} &&
+ # Some applications don't accept anything but /usr/bin
+ for file in /usr/java/latest/bin/*; do
+ bfile=`basename $file`
+ # Conflicting files with heimdal
+ if [[ "$bfile" != "klist" ]] && [[ "$bfile" != "kinit" ]]; then
+ ln -sf $file /usr/bin/
+ fi
+ done &&
+
mkdir -p /opt/lunar/plugins &&
rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
# Always use new plugin.
# Firefox 3, Seamonkey 2, Google chrome/inium use it
- # KDE3/4 Konqueror and Opera always use Java directly so do not use any plugin
- ln -sf /usr/java/latest/lib/i386/libnpjp2.so /opt/lunar/plugins/ &&
-
- # This didn't get created, dead link. Do it this way.
- ln -sf /usr/java/latest/lib/i386/server/libjvm.so /usr/lib/libjvm.so &&
+ # KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
+ if [ -d /usr/java/latest/lib/amd64 ]; then
+ ln -sf /usr/java/latest/lib/amd64/server/libjvm.so /usr/lib/
+ ln -sf /usr/java/latest/lib/amd64/libnpjp2.so /opt/lunar/plugins/
+ else
+ ln -sf /usr/java/latest/lib/i386/server/libjvm.so /usr/lib/
+ ln -sf /usr/java/latest/lib/i386/libnpjp2.so /opt/lunar/plugins/
+ fi &&
echo export JAVA_HOME=\"/usr/java/latest\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
diff --git a/compilers/sun-jre/BUILD.x86_64 b/compilers/sun-jre/BUILD.x86_64
deleted file mode 100644
index fac9977..0000000
--- a/compilers/sun-jre/BUILD.x86_64
+++ /dev/null
@@ -1,43 +0,0 @@
-(
-
- chmod +x $SOURCE &&
- echo "yes" | MORE="20000000" ./$SOURCE &&
-
- # Clean up old java 1.6.0 service packs
- rm -rf /usr/lib/j[rd][ek]1.6.0_* &&
- rm -rf /usr/java &&
- rm -f /usr/lib/libjvm.so &&
- mkdir -p /usr/java &&
-
- prepare_install &&
-
- # This is default and recommended installation place for Java from Sun
- cp -r $SOURCE_DIRECTORY/jre${FVERSION} /usr/java &&
- # Sun's recommended symlinks:
- # This one _always_ points on latest Java release
- ln -sf /usr/java/jre${FVERSION} /usr/java/latest &&
- # This one _always_ points on default Java.
- # If not set manually by root it defaults to /usr/java/latest:
- if [ ! -h /usr/java/default ]; then
- ln -sf /usr/java/latest /usr/java/default
- fi &&
-
- # Some apps only search for java in /usr/lib
- ln -sf /usr/java/jre${FVERSION} /usr/lib/jre${FVERSION} &&
-
- mkdir -p /opt/lunar/plugins &&
- rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
-
- # Always use new plugin.
- # Firefox 3, Seamonkey 2, Google chrome/inium use it
- # KDE3/4 Konqueror and Opera always use Java directly so do not use any plugin
- ln -sf /usr/java/latest/lib/amd64/libnpjp2.so /opt/lunar/plugins/ &&
-
- # This didn't get created, dead link. Do it this way.
- ln -sf /usr/java/latest/lib/amd64/server/libjvm.so /usr/lib/libjvm.so &&
-
- echo export JAVA_HOME=\"/usr/java/latest\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
- echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
- install -m644 $SOURCE_DIRECTORY/sun-jre.rc /etc/profile.d/
-
-) > $C_FIFO 2>&1
diff --git a/compilers/sun-jre/CONFLICTS b/compilers/sun-jre/CONFLICTS
index 63248ff..665f12d 100644
--- a/compilers/sun-jre/CONFLICTS
+++ b/compilers/sun-jre/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts j2sdk &&
+conflicts j2sdk
conflicts sun-jdk
diff --git a/compilers/sun-jre/DETAILS b/compilers/sun-jre/DETAILS
index 05b2fda..d3f7542 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,15 +1,18 @@
MODULE=sun-jre
- VERSION=6u27
- FVERSION=1.${VERSION/u/.0_}
- SOURCE=jre-$VERSION-linux-i586.bin
- SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/6u27-b07
- SOURCE_VFY=sha1:5a3d2e304d6cf62ee6a56cce322014cf3ceab2ad
- WEB_SITE=http://www.java.com/en/download/manual.jsp
+ VERSION=7
+ FVERSION=1.7.0
+# FVERSION=1.${VERSION/u/.0_}
+ SOURCE=jre-$VERSION-linux-i586.tar.gz
+ SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$VERSION
+ SOURCE_VFY=sha1:0da2bbc6982054332f71196fc1938be8926413ac
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jre$FVERSION
+ WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
LICENSE="proprietary"
ENTERED=20061113
- UPDATED=20110820
+ UPDATED=20110911
FUZZY=off
LDD_CHECK=off
+ ARCHIVE=off
SHORT="SUN java runtime environment"
cat << EOF
sun-jre is only the run time environment, should be sufficient for
diff --git a/compilers/sun-jre/DETAILS.x86_64 b/compilers/sun-jre/DETAILS.x86_64
index 8ac4f5f..27fd9b1 100644
--- a/compilers/sun-jre/DETAILS.x86_64
+++ b/compilers/sun-jre/DETAILS.x86_64
@@ -1,15 +1,18 @@
MODULE=sun-jre
- VERSION=6u27
- FVERSION=1.${VERSION/u/.0_}
- SOURCE=jre-$VERSION-linux-x64.bin
- SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/6u27-b07
- SOURCE_VFY=sha1:4003dca418d4a66d16de98a28d27298eeef6d079
- WEB_SITE=http://www.java.com/en/download/manual.jsp
+ VERSION=7
+ FVERSION=1.7.0
+# FVERSION=1.${VERSION/u/.0_}
+ SOURCE=jre-$VERSION-linux-x64.tar.gz
+ SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$VERSION
+ SOURCE_VFY=sha1:9eeaf1a1c6a98106ae50b1d3798e88588ad9ef9c
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jre$FVERSION
+ WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
LICENSE="proprietary"
ENTERED=20061113
- UPDATED=20110820
+ UPDATED=20110911
FUZZY=off
LDD_CHECK=off
+ ARCHIVE=off
SHORT="SUN java runtime environment"
cat << EOF
sun-jre is only the run time environment, should be sufficient for
diff --git a/compilers/sun-jre/POST_REMOVE b/compilers/sun-jre/POST_REMOVE
index 35eb536..fd21087 100644
--- a/compilers/sun-jre/POST_REMOVE
+++ b/compilers/sun-jre/POST_REMOVE
@@ -1 +1 @@
-rm -rf /usr/lib/jre1.6.0_*
+rm -rf /usr/java/jre1.7.0
diff --git a/compilers/sun-jre/PRE_BUILD b/compilers/sun-jre/PRE_BUILD
deleted file mode 100644
index c6fd87a..0000000
--- a/compilers/sun-jre/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-validate_source_dir $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-cp $SOURCE_CACHE/$SOURCE $SOURCE_DIRECTORY/
More information about the Lunar-commits
mailing list