[arch-commits] Commit in subversion/trunk (PKGBUILD)

[Felix Yan]

    Date: Tuesday, November 25, 2014 @ 02:08:07
  Author: fyan
Revision: 227070

specify with-jdk to workaround jdk detection

Modified:
  subversion/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 21:38:02 UTC (rev 227069)
+++ PKGBUILD	2014-11-25 01:08:07 UTC (rev 227070)
@@ -1,6 +1,6 @@
 # $Id$
 # Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Stéphane Gaudreault <stephane at archlinux.org>
 # Contributor: Paul Mattal <paul at archlinux.org>
 # Contributor: Jason Chu <jason at archlinux.org>
@@ -13,7 +13,7 @@
 url="http://subversion.apache.org/"
 license=('APACHE')
 depends=('sqlite' 'file' 'serf' 'systemd')
-makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
+makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment'
              'libgnome-keyring' 'kdelibs' 'ruby')
 optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
             'kdebase-runtime: for KWallet for auth credentials'
@@ -38,6 +38,7 @@
          'bb2857eceafcfac35dde39dcffad2314'
          '733011145b8a8e74baf4c9fc9197b3e8'
          '6b4340ba9d8845cd8497e013ae01be3f')
+validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01')  # Ben Reser
 
 prepare() {
    cd ${pkgname}-${pkgver}
@@ -51,7 +52,8 @@
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-serf=/usr --with-apxs \
                --with-sqlite=/usr \
-               --enable-javahl --with-gnome-keyring --with-kwallet \
+               --enable-javahl --with-jdk=/usr/lib/jvm/default \
+               --with-gnome-keyring --with-kwallet \
                --with-apache-libexecdir=/usr/lib/httpd/modules \
                --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
                --disable-static