1 files changed, 19 insertions, 7 deletions
diff --git a/graphics/picasa/picasa.SlackBuild b/graphics/picasa/picasa.SlackBuild
index dcd5547231..6207d5ef45 100644
--- a/graphics/picasa/picasa.SlackBuild
+++ b/graphics/picasa/picasa.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/bash
-#
+
 # Slackware build script of picasa (binary repackaging)
 
-# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=picasa
 VERSION=${VERSION:-3.0.5744}
-ARCH=${ARCH:-i386}	# The binary is built for i386 - leave this alone
-BUILD=${BUILD:-1}
+ARCH=${ARCH:-i386}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -33,13 +33,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "x86_64" ]; then
+  SRCARCH=amd64
+  LIBDIRSUFFIX="64"
+else
+  ARCH=i386
+  SRCARCH=i386
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $PKG
-ar -x $CWD/picasa_3.0-current_i386.deb
+ar -x $CWD/picasa_3.0-current_${SRCARCH}.deb
 tar xvf data.tar.gz
 rm data.tar.gz control.tar.gz debian-binary
 chown -R root:root .
@@ -68,7 +77,7 @@ sed -e s'|EXEC|picasafontcfg|' -e s'|ICON|picasa-fontcfg.xpm|' \
   $PKG/opt/google/picasa/3.0/desktop/picasa-fontcfg.desktop.template \
   > $PKG/usr/share/applications/google-picasa-fontcfg.desktop
 for i in $PKG/usr/share/applications/*.desktop ; do
-  echo "Categories=Graphics;Photography;Photograph;Viewer;2DGraphics;Application;Applications" \
+  echo "Categories=Graphics;Photography;Photograph;Viewer;2DGraphics;" \
     >> $i ;
 done
 
@@ -95,10 +104,13 @@ done
 # Kill some stuff we don't need/want
 rm -rf $PKG/usr/lib/{xulrunner-addons,mozilla-firefox,iceweasel,firefox}
 rm -rf $PKG/usr/share/gconf
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}