2 files changed, 21 insertions, 15 deletions
diff --git a/desktop/keynav/keynav.SlackBuild b/desktop/keynav/keynav.SlackBuild
index 1db89dfbc5..393fbed538 100644
--- a/desktop/keynav/keynav.SlackBuild
+++ b/desktop/keynav/keynav.SlackBuild
@@ -23,7 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keynav
-VERSION=${VERSION:-0.20101014.3067}
+VERSION=${VERSION:-20150730+4ae486d}
+COMMIT="4ae486db6697877e84b66583a0502afc7301ba16"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,7 +40,6 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-BUILDDIR=$TMP/$PRGNAM-$VERSION
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -57,11 +57,19 @@ fi
 
 set -e
 
-rm -rf $PKG $BUILDDIR
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar zxvf ${CWD}/${PRGNAM}-${VERSION}.tar.gz
-cd $BUILDDIR
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz || tar xvf $CWD/$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+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 {} \;
+
 make keynav
 
 # install
@@ -71,13 +79,11 @@ cp -a keynav $PKG/usr/bin
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-#find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $DOCDIR
-
-cp -a CHANGELIST COPYRIGHT README VERSION keynavrc $DOCDIR
-cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELIST COPYRIGHT README TODO keynavrc \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/keynav/keynav.info b/desktop/keynav/keynav.info
index 255d039757..8305c00ee0 100644
--- a/desktop/keynav/keynav.info
+++ b/desktop/keynav/keynav.info
@@ -1,8 +1,8 @@
 PRGNAM="keynav"
-VERSION="0.20101014.3067"
+VERSION="20150730+4ae486d"
 HOMEPAGE="http://www.semicomplete.com/projects/keynav/"
-DOWNLOAD="http://semicomplete.googlecode.com/files/keynav-0.20101014.3067.tar.gz"
-MD5SUM="5046697ee6025f52436742dda947f9ec"
+DOWNLOAD="https://github.com/jordansissel/keynav/archive/4ae486db6697877e84b66583a0502afc7301ba16.tar.gz"
+MD5SUM="ddad3e7b9f1cf77a3a828a99d194fe44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xdotool"