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

[Guillaume Alaux]

    Date: Monday, September 1, 2014 @ 17:53:15
  Author: guillaume
Revision: 220875

FS#41639 use new link pointing at JRE

Modified:
  icedtea-web/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-01 15:02:02 UTC (rev 220874)
+++ PKGBUILD	2014-09-01 15:53:15 UTC (rev 220875)
@@ -4,7 +4,7 @@
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
 pkgver=1.5.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://icedtea.classpath.org/wiki/IcedTea-Web'
 license=('GPL2')
@@ -15,18 +15,12 @@
 optdepends=('rhino: for using proxy auto config files')
 # Due to broken path names in the tarball that fails with LANG=C in our chroot
 noextract=${pkgbase}-${pkgver}.tar.gz
-source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz
-        001_do_not_set_classpath.patch)
-sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195'
-            'f929a292f1d2385b4a07ece9432a14ccba9be46a91d7b64168ddcb9a3e96302a')
+source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
+sha256sums=('03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195')
 
 prepare() {
   cd "${srcdir}"
   LANG=en_US.UTF-8 bsdtar -x -f "${srcdir}"/${pkgbase}-${pkgver}.tar.gz
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  # FS#41639
-  patch -p1 < "${srcdir}"/001_do_not_set_classpath.patch
 }
 
 build() {
@@ -34,7 +28,8 @@
   ./configure \
       --prefix=/usr/share/${pkgbase} \
       --datarootdir=/usr/share \
-      --with-jdk-home=/usr/lib/jvm/java-default-runtime \
+      --with-jdk-home=/usr/lib/jvm/default \
+      --with-jre-home=/usr/lib/jvm/default-runtime \
       --with-java=/usr/bin/java \
       --with-browser-tests \
       --with-firefox=/usr/bin/firefox \