diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template index 6abcc5c4cf..8aae7432bb 100644 --- a/srcpkgs/jre/template +++ b/srcpkgs/jre/template @@ -1,16 +1,16 @@ # Template file for 'oracle-jre' pkgname=jre -_extraversion=1.7.0_10 -version=7u10 +_extraversion=1.7.0_21 +version=7u21 revision=1 wrksrc="jre${_extraversion}" if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-x64.tar.gz" - checksum=a2a45566f4a87e70c0e13577d3bf2b7eeabcdda3279958a75ded1ece96e070d1 + checksum=27c846d070884f30084f212c8ca76af272177efc460304503bfaa488ff1ad8f1 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-i586.tar.gz" - checksum=0e91c275a87dc1ba049df3cfef16eb958199d80e55bea6a3555900d309615199 + checksum=30906850c673d5485813487b53db91260133196bb1ad7dc0757b652df9866f7a fi short_desc="Oracle's Java Runtime Environment (JRE) - Version 7" @@ -62,8 +62,8 @@ do_install() { rm -f ${DESTDIR}/usr/share/java/jre/lib/${_arch}/fxavcodecplugin-52.so - cd ${DESTDIR}/usr/lib/mozilla/plugins && \ - ln -sf ../../../share/java/jre/lib/${_arch}/libnpjp2.so . + cd ${DESTDIR}/usr/lib/mozilla/plugins + ln -sf ../../../share/java/jre/lib/${_arch}/libnpjp2.so . # linker's config vmkdir etc/ld.so.conf.d @@ -73,12 +73,10 @@ do_install() { jre_package() { nonfree=yes - nostrip=yes depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info" provides="java-runtime-${version}" replaces="java-runtime>=0" pkg_install() { - vmove etc - vmove usr + vmove all } }