5 files changed, 38 insertions, 25 deletions
diff --git a/graphics/rawstudio/README b/graphics/rawstudio/README
index 141be2ca0d..cb47f2c050 100644
--- a/graphics/rawstudio/README
+++ b/graphics/rawstudio/README
@@ -1,4 +1,4 @@
 Rawstudio is an open-source program to read and manipulate
 RAW images from most digital cameras.
 
-This requires gconf (also available at SlackBuilds.org).
+This requires exiv2 and GConf.
diff --git a/graphics/rawstudio/doinst.sh b/graphics/rawstudio/doinst.sh
index c3651bc867..65fd352418 100644
--- a/graphics/rawstudio/doinst.sh
+++ b/graphics/rawstudio/doinst.sh
@@ -1,4 +1,3 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild
index 4a7538d0f4..d3c248261a 100644
--- a/graphics/rawstudio/rawstudio.SlackBuild
+++ b/graphics/rawstudio/rawstudio.SlackBuild
@@ -6,10 +6,10 @@
 # Copyright (c) 2007, Nishant Limbachia (nishant@mnspace.net)
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
+# Redistribution and use of this script, with or without modification, is 
 # permitted provided that the following conditions are met:
 #
-# 1. Redistributions of script must retain the above copyright notice,
+# 1. Redistributions of script must retain the above copyright notice, 
 #    this list of conditions and the following disclaimer.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -25,14 +25,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
-# Modified by Erik Hanson <erik@slackbuilds.org>
 # No additional license terms  :-)
-
+ 
 PRGNAM=rawstudio
-VERSION=1.0
+VERSION=1.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,6 +42,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e 	# Exit on most errors
@@ -59,24 +61,36 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var
-
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+  
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : \
-          | xargs strip --strip-unneeded 2> /dev/null
+# Move the rawstudio primary icon to /usr/share/pixmaps toplevel dir
+mv $PKG/usr/share/icons/rawstudio.png $PKG/usr/share/pixmaps
+rmdir $PKG/usr/share/icons
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 0644 $PRGNAM.desktop $PKG/usr/share/applications
-install -m 0644 pixmaps/rawstudio.png $PKG/usr/share/pixmaps
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  pixmaps/artwork.license $PKG/usr/doc/$PRGNAM-$VERSION
+  pixmaps/artwork.license  $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/rawstudio/rawstudio.info b/graphics/rawstudio/rawstudio.info
index bce748659b..5bdd4f259f 100644
--- a/graphics/rawstudio/rawstudio.info
+++ b/graphics/rawstudio/rawstudio.info
@@ -1,8 +1,8 @@
 PRGNAM="rawstudio"
-VERSION="1.0"
+VERSION="1.2"
 HOMEPAGE="http://rawstudio.org/"
-DOWNLOAD="http://rawstudio.org/files/release/rawstudio-1.0.tar.gz"
-MD5SUM="26ddd38ccb5d74f7c7c6759dae13b7ad"
+DOWNLOAD="http://rawstudio.org/files/release/rawstudio-1.2.tar.gz"
+MD5SUM="25399cd80294fa44220a8940fc77689f"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/graphics/rawstudio/slack-desc b/graphics/rawstudio/slack-desc
index 34bb8c6d32..567ce5ac00 100644
--- a/graphics/rawstudio/slack-desc
+++ b/graphics/rawstudio/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler------------------------------------------------------|
+         |-----handy-ruler-------------------------------------------------------|
 rawstudio: RAWStudio (read and manipulate RAW images)
 rawstudio:
 rawstudio: Rawstudio is an open-source program to read and manipulate
 rawstudio: RAW images from most digital cameras.  Rawstudio can convert
 rawstudio: RAW files into JPEG, PNG, or TIF images.
-rawstudio: 
+rawstudio:
 rawstudio: Home Page: http://www.rawstudio.org/
-rawstudio: 
-rawstudio: 
-rawstudio: 
-rawstudio: 
+rawstudio:
+rawstudio:
+rawstudio:
+rawstudio: