extra/java7-openjdk to 7.u71_2.5.3-3

This commit is contained in:
Kevin Mihelich 2014-12-11 14:10:00 +00:00
parent c418e93237
commit ca92811d39
3 changed files with 9 additions and 10 deletions

View file

@ -23,7 +23,7 @@ _JDK_UPDATE_VERSION=71
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
pkgrel=1
pkgrel=3
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org'
license=('custom')
@ -128,9 +128,8 @@ check() {
package_jre7-openjdk-headless() {
pkgdesc='OpenJDK Java 7 headless runtime environment'
depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java')
optdepends=('libcups: needed for Java Mauve support - libmawt.so'
'fontconfig: needed for Java Mauve support - libmawt.so'
depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils' 'libcups')
optdepends=('fontconfig: needed for Java Mauve support - libmawt.so'
'java-rhino: for some JavaScript support')
provides=('java-runtime-headless=7' 'java-runtime-headless-openjdk=7')
conflicts=('openjdk6')
@ -190,7 +189,7 @@ package_jre7-openjdk-headless() {
done
popd
# Link JKS keystore from ca-certificates-java
# Link JKS keystore from ca-certificates-utils
rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
@ -211,7 +210,7 @@ package_jre7-openjdk-headless() {
package_jre7-openjdk() {
pkgdesc='OpenJDK Java 7 full runtime environment'
depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
optdepends=('icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
'giflib: for gif format support'
'libpulse: for advanced sound support'

View file

@ -25,7 +25,7 @@ post_install() {
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/bin/init-jks-keystore
/usr/bin/update-ca-trust
fi
}
@ -36,7 +36,7 @@ post_upgrade() {
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/bin/init-jks-keystore
/usr/bin/update-ca-trust
fi
}

View file

@ -25,7 +25,7 @@ post_install() {
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/bin/init-jks-keystore
/usr/bin/update-ca-trust
fi
}
@ -35,7 +35,7 @@ post_upgrade() {
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/bin/init-jks-keystore
/usr/bin/update-ca-trust
fi
}