2 files changed, 18 insertions, 8 deletions
diff --git a/network/offlineimap/offlineimap.SlackBuild b/network/offlineimap/offlineimap.SlackBuild
index 51cdfaad2a..ef93b6f88a 100644
--- a/network/offlineimap/offlineimap.SlackBuild
+++ b/network/offlineimap/offlineimap.SlackBuild
@@ -26,11 +26,20 @@
 
 PRGNAM=offlineimap
 VERSION=6.2.0
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG=_SBo}
 
-SRCNAM="${PRGNAM}_${VERSION}.orig"
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+SRCNAM="jgoerzen-offlineimap-debian-6.2.0-0-g5d4fe0c.tar.gz"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -39,11 +48,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e # Exit on most errors
 
-rm -fr $TMP/$PRGNAM $PKG
+rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$SRCNAM.tar.gz
-cd $PRGNAM
+tar xvf $CWD/$SRCNAM
+mv jgoerzen-offlineimap-1a9381a $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/network/offlineimap/offlineimap.info b/network/offlineimap/offlineimap.info
index c90fc6349a..e6155652d2 100644
--- a/network/offlineimap/offlineimap.info
+++ b/network/offlineimap/offlineimap.info
@@ -1,8 +1,8 @@
 PRGNAM="offlineimap"
 VERSION="6.2.0"
-HOMEPAGE="http://software.complete.org/software/projects/show/offlineimap"
-DOWNLOAD="http://software.complete.org/software/attachments/download/413/offlineimap_6.2.0.orig.tar.gz"
-MD5SUM="a23dab23ac08de063e330fe26d08e9b9"
+HOMEPAGE="http://github.com/jgoerzen/offlineimap"
+DOWNLOAD="http://download.github.com/jgoerzen-offlineimap-debian-6.2.0-0-g5d4fe0c.tar.gz"
+MD5SUM="6a986c25452d0840346de70e9386f1ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"