aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/guacamole-client/README3
-rw-r--r--network/guacamole-client/guacamole-client.SlackBuild19
-rw-r--r--network/guacamole-client/guacamole-client.info10
-rw-r--r--network/guacamole-client/slack-desc4
4 files changed, 12 insertions, 24 deletions
diff --git a/network/guacamole-client/README b/network/guacamole-client/README
index b63f2b72ae7c..82e659d2d5cb 100644
--- a/network/guacamole-client/README
+++ b/network/guacamole-client/README
@@ -2,4 +2,5 @@ guacamole-client contains all Java and JavaScript components
of Guacamole (guacamole, guacamole-common, guacamole-ext,
and guacamole-common-js).
-NOTE: This package will download lots of packages during building.
+NOTE: This package use the pre-built binary from upstream to
+prevent download lots of packages during building from source.
diff --git a/network/guacamole-client/guacamole-client.SlackBuild b/network/guacamole-client/guacamole-client.SlackBuild
index 7732e113d177..e8b6a70ed047 100644
--- a/network/guacamole-client/guacamole-client.SlackBuild
+++ b/network/guacamole-client/guacamole-client.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for guacamole-client
-# Copyright 2015 Zhu Qun-Ying
+# Copyright 2015-2017 Zhu Qun-Ying
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=guacamole-client
-VERSION=${VERSION:-0.9.9}
+VERSION=${VERSION:-0.9.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -34,7 +34,6 @@ OUTPUT=${OUTPUT:-/tmp}
set -e
-MAVEN=/usr/share/maven/bin/mvn
TOMCATUSER=${TOMCATUSER:-tomcat}
TOMCATGROUP=${TOMCATGROUP:-tomcat}
@@ -60,22 +59,10 @@ TOMCATHOME=`grep $TOMCATUSER /etc/passwd | awk -F : '{print $6}'`
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-$MAVEN package
mkdir -p $PKG/usr/share/lib/guacamole
-cp guacamole/target/guacamole-${VERSION}.war $PKG/usr/share/lib/guacamole
+cp $CWD/guacamole-${VERSION}.war $PKG/usr/share/lib/guacamole
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE CONTRIBUTING $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/etc/guacamole/
diff --git a/network/guacamole-client/guacamole-client.info b/network/guacamole-client/guacamole-client.info
index d26b6f015c13..3fa5fff5b160 100644
--- a/network/guacamole-client/guacamole-client.info
+++ b/network/guacamole-client/guacamole-client.info
@@ -1,10 +1,10 @@
PRGNAM="guacamole-client"
-VERSION="0.9.9"
-HOMEPAGE="http://guac-dev.org"
-DOWNLOAD="http://sourceforge.net/projects/guacamole/files/current/source/guacamole-client-0.9.9.tar.gz"
-MD5SUM="e040d139bf6a85eeb806ac810492c6ff"
+VERSION="0.9.14"
+HOMEPAGE="https://guacamole.apache.org"
+DOWNLOAD="http://archive.apache.org/dist/guacamole/0.9.14/binary/guacamole-0.9.14.war"
+MD5SUM="bbee385b00329a32d89452791776f652"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="apache-tomcat apache-maven"
+REQUIRES="apache-tomcat"
MAINTAINER="Zhu Qun-Ying"
EMAIL="zhu.qunying@gmail.com"
diff --git a/network/guacamole-client/slack-desc b/network/guacamole-client/slack-desc
index 5d1f54d8a540..eb3a9402ba9d 100644
--- a/network/guacamole-client/slack-desc
+++ b/network/guacamole-client/slack-desc
@@ -5,14 +5,14 @@
# You must make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':' except on otherwise blank lines.
- |-----handy-ruler------------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
guacamole-client: guacamole-client (Guacamole client)
guacamole-client:
guacamole-client: guacamole-client contains all Java and JavaScript components
guacamole-client: of Guacamole (guacamole, guacamole-common, guacamole-ext,
guacamole-client: and guacamole-common-js).
guacamole-client:
-guacamole-client: http://guac-dev.org
+guacamole-client: http://guacamole.apache.org/
guacamole-client:
guacamole-client:
guacamole-client: