3 files changed, 17 insertions, 7 deletions
diff --git a/network/gnome-mail-notification/README b/network/gnome-mail-notification/README
index 0aa03cd95c..77b42aa111 100644
--- a/network/gnome-mail-notification/README
+++ b/network/gnome-mail-notification/README
@@ -5,6 +5,4 @@ arrives, Mail Notification alerts you by displaying an icon in the
 notification area.  Highly configurable, and compatible with most mail
 back-ends and mailbox typtes (mbox, MH, Evolution)
 
-http://www.nongnu.org/mailnotify/
-
-Requires libnotify, libgnome, and rarian, available at SlackBuilds.org
+This requires libgnome and rarian.
diff --git a/network/gnome-mail-notification/gnome-mail-notification.SlackBuild b/network/gnome-mail-notification/gnome-mail-notification.SlackBuild
index 2d35a84d72..e91b174381 100644
--- a/network/gnome-mail-notification/gnome-mail-notification.SlackBuild
+++ b/network/gnome-mail-notification/gnome-mail-notification.SlackBuild
@@ -7,10 +7,19 @@
 PRGNAM=gnome-mail-notification
 OFFICIALNAM=mail-notification
 VERSION=${VERSION:-5.4}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e # Exit on most errors
@@ -33,7 +45,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $OFFICIALNAM-$VERSION
-tar jxvf $CWD/$OFFICIALNAM-$VERSION.tar.bz2
+tar xvf $CWD/$OFFICIALNAM-$VERSION.tar.bz2
 cd $OFFICIALNAM-$VERSION
 chown -R root:root .
 find . \
diff --git a/network/gnome-mail-notification/slack-desc b/network/gnome-mail-notification/slack-desc
index 4c5d768b46..018c7553c3 100644
--- a/network/gnome-mail-notification/slack-desc
+++ b/network/gnome-mail-notification/slack-desc
@@ -7,13 +7,13 @@
 
                        |-----handy-ruler------------------------------------------------------|
 gnome-mail-notification: Gnome Mail Notification Applet
-gnome-mail-notification: 
+gnome-mail-notification:
 gnome-mail-notification: Mail Notification monitors your mailboxes for new mail. When new mail
 gnome-mail-notification: arrives, Mail Notification alerts you by displaying an icon in the
 gnome-mail-notification: notification area. Highly configurable, and compatible with most mail
 gnome-mail-notification: back-ends and mailbox typtes (mbox, MH, Evolution)
 gnome-mail-notification:
+gnome-mail-notification: http://www.nongnu.org/mailnotify/
 gnome-mail-notification:
 gnome-mail-notification:
 gnome-mail-notification:
-gnome-mail-notification: http://www.nongnu.org/mailnotify/