From f062299969f188ebae98cfbc4d2e79cce803d740 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Thu, 20 May 2010 00:20:15 -0500
Subject: [PATCH] misc/ibus: Miscellaneous cleanups.

---
 misc/ibus/README          |  2 +-
 misc/ibus/ibus.SlackBuild | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/misc/ibus/README b/misc/ibus/README
index bffe1005e9..e1265f0d69 100644
--- a/misc/ibus/README
+++ b/misc/ibus/README
@@ -6,7 +6,7 @@ After installing at least one engine (e.g. PinYin engine) and enabling it
 in ibus-setup, ibus itself should be fully functional.  If you want to use 
 ibus as your primary input method, you should remove the scim package.
 
-This requires gconf, notify-python and pyxdg.
+This requires gconf and pyxdg.
 If you use qt applications, then you probably want ibus-qt as well.
 
 After installing, ibus will automatically be started in an xdg-compliant
diff --git a/misc/ibus/ibus.SlackBuild b/misc/ibus/ibus.SlackBuild
index dbbbb508b7..13cd85c475 100644
--- a/misc/ibus/ibus.SlackBuild
+++ b/misc/ibus/ibus.SlackBuild
@@ -29,10 +29,19 @@
 
 PRGNAM=ibus
 VERSION=${VERSION:-1.3.1}
-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
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)