3 files changed, 32 insertions, 8 deletions
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index 906114f0c4..fbeb7e2e47 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -5,17 +5,37 @@
 # Written by (Andy Alt) (andyqwerty@users.sourceforge.net)
 
 PRGNAM=rmw
-VERSION=${VERSION:-0.98.3.9beta} 
+VERSION=${VERSION:-0.98.4.2beta}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=noarch	# only bash script here
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
@@ -31,11 +51,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
+# Compile the application and install it into the $PKG directory
 make
 make install DESTDIR=$PKG
 
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index 381e465891..4fa026471b 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,10 +1,10 @@
 PRGNAM="rmw"
-VERSION="0.98.3.9beta"
+VERSION="0.98.4.2beta"
 HOMEPAGE="http://rmw.sf.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rmw/rmw-0.98.3.9beta.tar.gz"
-MD5SUM="bdc92882663aa49c3386050df8563ac6"
+DOWNLOAD="http://sourceforge.net/projects/rmw/files/Source%20Packages/rmw-0.98.4.2beta.tar.gz"
+MD5SUM="6be5969f63342c9943568eed9ef3f304"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Andy Alt"
 EMAIL="andyqwerty@users.sourceforge.net"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/system/rmw/slack-desc b/system/rmw/slack-desc
index 1f13a565b8..7a66030681 100644
--- a/system/rmw/slack-desc
+++ b/system/rmw/slack-desc
@@ -8,7 +8,7 @@
    |-----handy-ruler------------------------------------------------------|
 rmw: rmw (command line trash can/recycle bin)
 rmw:
-rmw: rmw (ReMove to Waste) is a bash script which functions 
+rmw: rmw (ReMove to Waste) is a bash script which functions
 rmw: as a command line recycle bin/trash can utility. Optionally,
 rmw: it can ReMove files to Desktop trash and has been tested
 rmw: on GNOME, KDE, and Xfce. It features quick and easy restoration