[arch-commits] Commit in ca-certificates-java/repos (3 files)

[Jan de Groot]

    Date: Saturday, June 13, 2009 @ 08:40:35
  Author: jgc
Revision: 42366

Merged revisions 42365 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ca-certificates-java/trunk

........
  r42365 | jgc | 2009-06-13 14:40:19 +0200 (Sat, 13 Jun 2009) | 1 line
  
  upgpkg: ca-certificates-java 20081028-2
........

Modified:
  ca-certificates-java/repos/extra-x86_64/	(properties)
  ca-certificates-java/repos/extra-x86_64/PKGBUILD
  ca-certificates-java/repos/extra-x86_64/ca-certificates-java.install

------------------------------+
 PKGBUILD                     |    2 +-
 ca-certificates-java.install |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


Property changes on: ca-certificates-java/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ca-certificates-java/trunk:1-38908
   + /ca-certificates-java/trunk:1-42365

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-13 12:40:19 UTC (rev 42365)
+++ extra-x86_64/PKGBUILD	2009-06-13 12:40:35 UTC (rev 42366)
@@ -3,7 +3,7 @@
 
 pkgname=ca-certificates-java
 pkgver=20081028
-pkgrel=1
+pkgrel=2
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('i686' 'x86_64')
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'

Modified: extra-x86_64/ca-certificates-java.install
===================================================================
--- extra-x86_64/ca-certificates-java.install	2009-06-13 12:40:19 UTC (rev 42365)
+++ extra-x86_64/ca-certificates-java.install	2009-06-13 12:40:35 UTC (rev 42366)
@@ -1,6 +1,13 @@
 post_install() {
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
+    for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do
+      if [ -x $jvm/bin/keytool ]; then
+        break
+      fi
+    done
+    if [ -x $jvm/bin/keytool ]; then
+      /usr/sbin/init-jks-keystore
+    fi
   fi
 }