jre: update to 7u10.

This commit is contained in:
Juan RP 2013-01-04 16:24:23 +01:00
parent aaac3a8d2c
commit 582f987144
3 changed files with 30 additions and 35 deletions

View file

@ -15,7 +15,10 @@ post)
You MUST read and agree to the license stored in
/usr/share/licenses/jre/LICENSE before using it.
- Please re-login to include JRE in your PATH.
- Please re-login to include JRE in your PATH or re-source
/etc/profile:
$ source /etc/profile
=====================================================================
_EOF

View file

@ -1,2 +1,2 @@
export PATH=$PATH:/opt/java/jre/bin
export JAVA_HOME=${JAVA_HOME:-/opt/java/jre}
export PATH=$PATH:/usr/share/java/jre/bin
export JAVA_HOME=${JAVA_HOME:-/usr/share/java/jre}

View file

@ -1,36 +1,28 @@
# Template file for 'oracle-jre'
pkgname=jre
nonfree=yes
_extraversion=1.7.0_03
version=7u3
_extraversion=1.7.0_10
version=7u10
revision=1
wrksrc="jre${_extraversion}"
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-x64.tar.gz"
# distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}/jre-${version}-linux-x64.tar.gz"
checksum=eb06eab781be0c1dfaae2e5ef3afff5267e24e77f62401b09777673508b8d68c
checksum=a2a45566f4a87e70c0e13577d3bf2b7eeabcdda3279958a75ded1ece96e070d1
else
distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-i586.tar.gz"
# distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}/jre-${version}-linux-i586.tar.gz"
checksum=814bbbdb4c73b11c213de9543c821854b1ff18d2d8d45ae8d8cbeacab9b03c70
checksum=0e91c275a87dc1ba049df3cfef16eb958199d80e55bea6a3555900d309615199
fi
makedepends="libXrender-devel libXtst-devel alsa-lib-devel"
fulldepends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info"
revision=1
short_desc="Oracle's Java Runtime Environment (JRE) - Version 7, Update 3"
short_desc="Oracle's Java Runtime Environment (JRE) - Version 7"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
license="oracle"
long_desc="
Oracle Java SE 7, Update 3 - Runtime Environment (JRE) only:
This release includes new features such as small language changes for
improved developer productivity, a new Filesystem API, support for
asynchronous I/O, a new fork/join framework for multicore performance,
improved support for dynamic and script languages, updates to security,
internationalization and web standards and much more."
wrksrc=jre${_extraversion}
nonfree=yes
nostrip=yes
depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info"
provides="java-runtime-${version}"
replaces="java-runtime>=0"
do_install()
{
@ -49,22 +41,22 @@ do_install()
vcopy LICENSE usr/share/licenses/jre
vcopy THIRDPARTYLICENSEREADME.txt usr/share/licenses/jre
# Fix system prefs folder FS#18872
vmkdir etc/.java/.systemPrefs
# For system environment vars and desktop extra shortcut
vinstall ${FILESDIR}/jre.sh 644 etc/profile.d
vinstall ${FILESDIR}/java-policy-settings.desktop 644 usr/share/applications
# Install JRE
vmkdir opt/java/jre
vcopy bin opt/java/jre
vcopy lib opt/java/jre
vcopy release opt/java/jre
vcopy Welcome.html opt/java/jre
vmkdir usr/share/java/jre
vcopy bin usr/share/java/jre
vcopy lib usr/share/java/jre
vcopy release usr/share/java/jre
vcopy Welcome.html usr/share/java/jre
rm -rf ${DESTDIR}/opt/java/jre/lib/desktop
rm -rf ${DESTDIR}/opt/java/jre/lib/locale
rm -rf ${DESTDIR}/usr/share/java/jre/lib/desktop
rm -rf ${DESTDIR}/usr/share/java/jre/lib/locale
# Remove shlib linking to old ffmpeg libraries.
rm -f ${DESTDIR}/usr/share/java/jre/lib/amd64/fxavcodecplugin-52.so
# Install mozilla compatible plugin.
vmkdir usr/lib/mozilla/plugins
@ -77,10 +69,10 @@ do_install()
fi
cd ${DESTDIR}/usr/lib/mozilla/plugins && \
ln -sf ../../../../opt/java/jre/lib/${_arch}/libnpjp2.so .
ln -sf ../../../share/java/jre/lib/${_arch}/libnpjp2.so .
# linker's config
vmkdir etc/ld.so.conf.d
echo "/opt/java/jre/lib/${_arch}" > \
echo "/usr/share/java/jre/lib/${_arch}" > \
${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
}