oracle-jre: move jre to /usr/lib/jvm/jre$version; update to 8u22

This commit is contained in:
Enno Boland 2014-09-01 23:16:39 +02:00
parent dddebfa16a
commit 00e4acd466
4 changed files with 16 additions and 17 deletions

View File

@ -16,15 +16,15 @@ do_install() {
echo "$ORACLE_JRE_CHECKSUM $BUILD_DIR/jre.tar.gz" | sha256sum -c || return 1
tar xf ${BUILD_DIR}/jre.tar.gz || return 1
if [ -d usr/share/java/$PKGNAME ]; then
rm -rf usr/share/java/$PKGNAME
if [ -d usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION ]; then
rm -rf usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
fi
mv jre$ORACLE_JRE_LONG_VERSION usr/share/java/$PKGNAME || return 1
mv jre$ORACLE_JRE_LONG_VERSION usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION || return 1
}
case "${ACTION}" in
post)
. usr/share/java/oracle-jre-vars.sh
. usr/lib/jvm/oracle-jre-vars.sh
do_install
RESULT=$?
rm -r $BUILD_DIR

View File

@ -1,6 +1,6 @@
case "$ACTION" in
pre)
. usr/share/java/oracle-jre-vars.sh
rm -r usr/share/java/$PKGNAME
. usr/lib/jvm/oracle-jre-vars.sh
rm -r usr/lib/jvm/$PKGNAME
;;
esac

View File

@ -1,2 +1,2 @@
export JAVA_HOME=${JAVA_HOME=/usr/share/java/oracle-jre}
export PATH="$PATH:/usr/share/java/oracle-jre/bin"
export JAVA_HOME=${JAVA_HOME=/usr/lib/jvm/jre%LONG_VERSION%}
export PATH="$PATH:/usr/lib/jvm/jre%LONG_VERSION%/bin"

View File

@ -1,8 +1,8 @@
# Template file for 'oracle-jre'
pkgname=oracle-jre
version=8u11
_longVersion=1.8.0_11
_build=12
version=8u20
_longVersion=1.8.0_20
_build=26
revision=1
short_desc="Java Runtime Environment (JRE)"
maintainer="Enno Boland <eb@s01.de>"
@ -15,18 +15,17 @@ depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
hostmakedepends="wget"
provides="java-runtime-${version}_1"
replaces="java-runtime>=0"
conflicts="oracle-jdk>=0"
case "${XBPS_TARGET_MACHINE}" in
x86_64)
_arch=amd64
_filename=jre-${version}-linux-x64.tar.gz
checksum="17d0d015c3bd7e535490c6ce869655b6ac4024ba3dc39dc9ed743de4376750a4"
checksum="23f149928ae7d7f97d9b93eb859f197744ffad2d4082a96fcde24021a08cab34"
;;
i686)
_arch=i386
_filename=jre-${version}-linux-i586.tar.gz
checksum="b1348b4842cc23862ea9ef69f71674f49fc1197caec0a8d82502009568762442"
checksum="340bb9bb882c90792439a3688e234c04378e03bf9cda39f1c9de2acbc3b159c1"
;;
esac
@ -55,13 +54,13 @@ do_build() {
-e "s|%ORACLE_JRE_CHECKSUM%|${checksum}|" \
${FILESDIR}/oracle-jre-vars.sh.in > oracle-jre-vars.sh
sed \
-e "s|^Exec=|Exec=/usr/share/java/$pkgname/bin/policytool|" \
-e "s|^Exec=|Exec=/usr/lib/jvm/jre${_longVersion}/bin/policytool|" \
${FILESDIR}/java-policy-settings.desktop.in > java-policy-settings.desktop
}
do_install() {
vmkdir "usr/share/licenses/${pkgname}"
vinstall oracle-jre-vars.sh 644 "usr/share/java"
vinstall oracle-jre-vars.sh 644 "usr/lib/jvm/"
vinstall LICENSE 644 "usr/share/licenses/${pkgname}"
vinstall java-policy-settings.desktop 644 usr/share/applications
@ -71,7 +70,7 @@ do_install() {
done
vmkdir "usr/lib/mozilla/plugins"
ln -srf ${DESTDIR}/usr/share/java/oracle-jre/lib/${_arch}/libnpjp2.so \
ln -srf ${DESTDIR}/usr/lib/jvm/jre${_longVersion}/lib/${_arch}/libnpjp2.so \
${DESTDIR}/usr/lib/mozilla/plugins
vmkdir "etc/profile.d"