From 43243c964d638ed620c00d0426e5ef4f808d1017 Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
Date: Fri, 21 Mar 2014 13:07:31 +0700
Subject: [PATCH] gis/udig: Update Dependencies.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 gis/udig/udig.SlackBuild | 13 ++-----------
 gis/udig/udig.info       |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/gis/udig/udig.SlackBuild b/gis/udig/udig.SlackBuild
index 339a3ebf5e..fbc7033dde 100644
--- a/gis/udig/udig.SlackBuild
+++ b/gis/udig/udig.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=udig
 VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,18 +64,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# uDig comes with its own JRE, but this is unnecessay as long as the JAI jars are
-# installed in the correct location. This is how other distros avoid shipping a
-# duplicate Java environment with uDig.
-mkdir -p $PKG/usr/share/$PRGNAM/jai
-cp -a jre/lib/ext/jai_*.jar $PKG/usr/share/$PRGNAM/jai
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/java/jre/lib/ext
-ln -s /usr/share/$PRGNAM/jai/jai_codec.jar $PKG/usr/lib$LIBDIRSUFFIX/java/jre/lib/ext/jai_codec.jar
-ln -s /usr/share/$PRGNAM/jai/jai_core.jar $PKG/usr/lib$LIBDIRSUFFIX/java/jre/lib/ext/jai_core.jar
-ln -s /usr/share/$PRGNAM/jai/jai_imageio.jar $PKG/usr/lib$LIBDIRSUFFIX/java/jre/lib/ext/jai_imageio.jar
-
 # the GDAL libs need to be extracted from the JRE directory and placed in the LD_LIBRARY_PATH
 # at uDig runtime
+mkdir -p $PKG/usr/share/$PRGNAM
 cp -a jre/lib/${GDALDIR}/libgdaljni.so{,.1} $PKG/usr/share/$PRGNAM
 sed -i '2i\
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/bin/share/udig
diff --git a/gis/udig/udig.info b/gis/udig/udig.info
index a24e8d0fb8..356c225d75 100644
--- a/gis/udig/udig.info
+++ b/gis/udig/udig.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://udig.refractions.net/files/downloads/udig-1.4.0.linux.gtk.x86.z
 MD5SUM="116b7f577ba08b1e2b7d0100588f5259"
 DOWNLOAD_x86_64="http://udig.refractions.net/files/downloads/udig-1.4.0.linux.gtk.x86_64.zip"
 MD5SUM_x86_64="b401a3fc48b33888dcf894104b4f903e"
-REQUIRES="jdk"
+REQUIRES="jai-imageio"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"