diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-12-11 17:53:48 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-12-11 17:53:48 -0200 |
| commit | c647f4b40c4ac057f7d82c46fae251c54830a7e2 (patch) | |
| tree | 5cc69d3dcdce69f3077157fc1f979e70d68510c9 | |
| parent | 0494b780c9ddfe38a81640b95c04e429d06bd065 (diff) | |
java7-openjdk-7.u71_2.5.3-3.parabola1: updating revision from Arch
* use ca-certificates-utils
* add libcups as dependency (FS#42595 -> https://bugs.archlinux.org/task/42595)
| -rw-r--r-- | libre/java7-openjdk/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/java7-openjdk/jdk7-openjdk.install | 4 | ||||
| -rw-r--r-- | libre/java7-openjdk/jre7-openjdk-headless.install | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD index 70f28e447..fc999cb36 100644 --- a/libre/java7-openjdk/PKGBUILD +++ b/libre/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 224379 2014-10-15 08:43:00Z guillaume $ +# $Id: PKGBUILD 226383 2014-11-19 09:26:56Z guillaume $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> @@ -15,7 +15,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.parabola1 +pkgrel=3.parabola1 arch=('i686' 'x86_64') url='http://icedtea.classpath.org' license=('custom') @@ -117,9 +117,8 @@ check() { package_jre7-openjdk-headless() { pkgdesc='OpenJDK Java 7 headless runtime environment (Parabola rebranded)' - 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') @@ -179,7 +178,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" @@ -200,7 +199,7 @@ package_jre7-openjdk-headless() { package_jre7-openjdk() { pkgdesc='OpenJDK Java 7 full runtime environment (Parabola rebranded)' 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' diff --git a/libre/java7-openjdk/jdk7-openjdk.install b/libre/java7-openjdk/jdk7-openjdk.install index b07b15053..4ccceac29 100644 --- a/libre/java7-openjdk/jdk7-openjdk.install +++ b/libre/java7-openjdk/jdk7-openjdk.install @@ -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 } diff --git a/libre/java7-openjdk/jre7-openjdk-headless.install b/libre/java7-openjdk/jre7-openjdk-headless.install index e21f8a30d..1fc2a9093 100644 --- a/libre/java7-openjdk/jre7-openjdk-headless.install +++ b/libre/java7-openjdk/jre7-openjdk-headless.install @@ -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 } |