summaryrefslogtreecommitdiffstats
path: root/gis
diff options
context:
space:
mode:
author Benjamin Trigona-Harany <slackbuilds@jaxartes.net>2014-03-21 13:07:31 +0700
committer Erik Hanson <erik@slackbuilds.org>2014-03-21 13:01:22 -0500
commit43243c964d638ed620c00d0426e5ef4f808d1017 (patch)
tree68e9f75d76d190aa1b2dda9b92d6d3daf2d3908c /gis
parent34e83ff53a18743ea5e55383b9f2797fb873ba84 (diff)
downloadslackbuilds-43243c964d638ed620c00d0426e5ef4f808d1017.tar.gz
slackbuilds-43243c964d638ed620c00d0426e5ef4f808d1017.tar.xz
gis/udig: Update Dependencies.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'gis')
-rw-r--r--gis/udig/udig.SlackBuild13
-rw-r--r--gis/udig/udig.info2
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"