graphics/picasa: Updated for version 3.0.5744

1 files changed, 21 insertions, 25 deletions

diff --git a/graphics/picasa/picasa.SlackBuild b/graphics/picasa/picasa.SlackBuild
index 9bc81031b1..dcd5547231 100644
--- a/graphics/picasa/picasa.SlackBuild
+++ b/graphics/picasa/picasa.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=picasa
-VERSION=${VERSION:-2.7.3736}
+VERSION=${VERSION:-3.0.5744}
 ARCH=${ARCH:-i386}	# The binary is built for i386 - leave this alone
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,42 +33,39 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Require the script to exit if any command fails
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $PKG
-ar -x $CWD/${PRGNAM}_$VERSION-15_${ARCH}.deb
+ar -x $CWD/picasa_3.0-current_i386.deb
 tar xvf data.tar.gz
 rm data.tar.gz control.tar.gz debian-binary
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
-# Create symlinks in /usr/bin to picasa, mediadetector, and picasafontcfg
+# Create symlinks in /usr/bin to picasa and picasafontcfg
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
-  ln -fs /opt/picasa/bin/picasa .
-  ln -s /opt/picasa/bin/picasafontcfg .
-  ln -s /opt/picasa/bin/mediadetector .
+  ln -fs /opt/google/picasa/3.0/bin/picasa .
+  ln -s /opt/google/picasa/3.0/bin/picasafontcfg .
 )
 
 # Install icons
 mkdir -p $PKG/usr/share/pixmaps
-install -m 0644 $PKG/opt/picasa/desktop/picasa.xpm \
-  $PKG/usr/share/pixmaps/picasa.xpm
-install -m 0644 $PKG/opt/picasa/desktop/picasa-fontcfg.xpm \
-  $PKG/usr/share/pixmaps/picasa-fontcfg.xpm
+install -m 0644 \
+  $PKG/opt/google/picasa/3.0/desktop/picasa.xpm \
+  $PKG/opt/google/picasa/3.0/desktop/picasa-fontcfg.xpm \
+  $PKG/usr/share/pixmaps
 
 # Install desktop files for menu entries
 mkdir -p $PKG/usr/share/applications
-sed -e s#EXEC#picasa# -e s#ICON#picasa.xpm# \
-  $PKG/opt/picasa/desktop/google-picasa.desktop.template \
+sed -e 's|EXEC|picasa|' -e 's|ICON|picasa.xpm|' \
+  $PKG/opt/google/picasa/3.0/desktop/picasa.desktop.template \
   > $PKG/usr/share/applications/google-picasa.desktop
-sed -e s#EXEC#mediadetector# -e s#ICON#picasa.xpm# \
-  $PKG/opt/picasa/desktop/google-picasa-mediadetector.desktop.template \
-  > $PKG/usr/share/applications/google-picasa-mediadetector.desktop
-sed -e s#EXEC#picasafontcfg# -e s#ICON#picasa-fontcfg.xpm# \
-  $PKG/opt/picasa/desktop/google-picasa-fontcfg.desktop.template \
+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" \
@@ -82,9 +79,8 @@ echo 'application/x-picasa-detect; false; description=Picasa Installation detect
 
 # Relocate docs to appropriate place
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts
-mv $PKG/opt/picasa/{LICENSE.FOSS,README} \
+mv $PKG/opt/google/picasa/3.0/{LICENSE.FOSS,README} \
   $PKG/usr/doc/$PRGNAM-$VERSION
-
 # Add some unsupported stuff (feel free to play, but unless you figure out
 # how to integrate them correctly for *everyone*, leave us alone) :)  
 # --rworkman
@@ -92,17 +88,17 @@ for i in \
   picasa-hook-email.sh.template picasa-hook-filemanager.sh.template \
   picasa-hook-mimehandler.sh.template picasa-hook-urlhandler.sh.template ;
 do \
-  ln -s /opt/picasa/desktop/$i \
+  ln -s /opt/google/picasa/3.0/desktop/$i \
     $PKG/usr/doc/$PRGNAM-$VERSION/scripts/$i ; 
 done
 
-# Add slack-desc and doinst.sh (which updates desktop database after install)
+# 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
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Ensure sane ownership and permissions and make the package
 cd $PKG
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
 /sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz