2 files changed, 12 insertions, 11 deletions
diff --git a/office/ganttproject/ganttproject.SlackBuild b/office/ganttproject/ganttproject.SlackBuild
index e366278ee2..ae6630568b 100644
--- a/office/ganttproject/ganttproject.SlackBuild
+++ b/office/ganttproject/ganttproject.SlackBuild
@@ -25,14 +25,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ganttproject
-VERSION=${VERSION:-2.6.6_r1715}		# dashes in $VERSION confuse pkgtool
+VERSION=${VERSION:-2.7}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-## source version now relies on commit hash
-SRCVERSION=${SRCVERSION:-9cc2cf862fc4}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -46,9 +43,13 @@ mkdir -p \
   $PKG/{opt/ganttproject,usr/{bin,share/{applications,pixmaps,mime/packages}}} \
   $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+if [ -e $CWD/$PRGNAM-$VERSION.tar.gz ]; then
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,7 +65,7 @@ cp -a eclipsito.jar ganttproject plugins $PKG/opt/ganttproject
 chmod 755 $PKG/opt/ganttproject/ganttproject
 
 # This is for CLI users:
-ln -s /opt/ganttproject/ganttproject $PKG/usr/bin/
+ln -sf /opt/ganttproject/ganttproject $PKG/usr/bin/
 
 # And this is for GUI users:
 cp \
diff --git a/office/ganttproject/ganttproject.info b/office/ganttproject/ganttproject.info
index e9998ebced..b327d606c6 100644
--- a/office/ganttproject/ganttproject.info
+++ b/office/ganttproject/ganttproject.info
@@ -1,8 +1,8 @@
 PRGNAM="ganttproject"
-VERSION="2.6.6_r1715"
+VERSION="2.7"
 HOMEPAGE="http://www.ganttproject.biz"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/ganttproject/ganttproject-9cc2cf862fc4.tar.gz"
-MD5SUM="86179ef120a4e43a3ef46bde8f89d74a"
+DOWNLOAD="https://github.com/bardsoftware/ganttproject/archive/ganttproject-2.7.tar.gz"
+MD5SUM="68ba798ed9794f6711f7a1787ad52abc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"