multimedia/GoogleEarth: Updated for version 5.0.11733.9347

4 files changed, 22 insertions, 18 deletions

diff --git a/multimedia/GoogleEarth/GoogleEarth.SlackBuild b/multimedia/GoogleEarth/GoogleEarth.SlackBuild
index 51a10c9c868d..311e40192b78 100644
--- a/multimedia/GoogleEarth/GoogleEarth.SlackBuild
+++ b/multimedia/GoogleEarth/GoogleEarth.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for google-earth
 
-# Copyright 2007 Michiel van Wessem (http://michielvwessem.wordpress.com)
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # and to Daniel de Kok and Alan_Hicks for their comments.
 
 PRGNAM=GoogleEarth
-VERSION=4.3.7284.3916
+VERSION=${VERSION:-5.0.11733.9347}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -58,8 +58,8 @@ find . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
-# Sadly, Google has some rather inconsisten permissions for normal files. This 
-# should deal with them rather nicely.
+# Sadly, Google has some rather inconsistent permissions for normal files;
+# this should deal with them rather nicely.
 find . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) \
   -exec chmod 0644 {} \;
 
@@ -67,8 +67,10 @@ mv $PKG/opt/$PRGNAM/bin/googleearth $PKG/opt/$PRGNAM
 rmdir $PKG/opt/$PRGNAM/bin
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 # Let's use the information from the included postinstall.sh
diff --git a/multimedia/GoogleEarth/GoogleEarth.info b/multimedia/GoogleEarth/GoogleEarth.info
index 6e2657de4660..cab2c131695b 100644
--- a/multimedia/GoogleEarth/GoogleEarth.info
+++ b/multimedia/GoogleEarth/GoogleEarth.info
@@ -1,8 +1,8 @@
 PRGNAM="GoogleEarth"
-VERSION="4.3.7284.3916"
+VERSION="5.0.11733.9347"
 HOMEPAGE="http://earth.google.com"
 DOWNLOAD="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin"
-MD5SUM="8e9eb1acc7ee4c80542756386de1bf78"
+MD5SUM="a6bde31a22b8cc5f0b170cd21dd404e1"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="dsomero"
diff --git a/multimedia/GoogleEarth/README b/multimedia/GoogleEarth/README
index 15f7d329decf..d064021089f0 100644
--- a/multimedia/GoogleEarth/README
+++ b/multimedia/GoogleEarth/README
@@ -18,15 +18,17 @@ message stating that it is unable to find the Bitstream Vera fonts.
 This should be safe to ignore - it will use other fonts (and the
 DejaVu fonts included with Slackware are based on the Bitstream fonts).
 
-NOTES:
-1) Google updates the GoogleEarth executable without changing
-   the download link location and they don't use version numbering in
-   the filename (the version is more an internal numbering).  
+NOTEs:
+1) Google updates the GoogleEarth bin-file without changing the download
+   link location and they don't use version numbering in the filename 
+   (the version is more an internal numbering).  
    
    Therefore, this script is subject to failing (and a different MD5SUM) 
    at any time due to the fact that you might get a newer version 
-   of GoogleEarth than what the script is designed to use.
+   of GoogleEarth than what the script is designed to use. Please notify 
+   the maintainer if this is the case.
 
-2) GoogleEarth requires you you have OpenGL drives installed on your system
-   (and Xorg configured to use them). Not doing so, will cause X to crash.
+2) GoogleEarth now requires that you have OpenGL drivers installed on your 
+   system (and Xorg configured to use them). Not doing so will cause X 
+   to crash.
 
diff --git a/multimedia/GoogleEarth/doinst.sh b/multimedia/GoogleEarth/doinst.sh
index 22652f902315..acbb07fe3d1a 100644
--- a/multimedia/GoogleEarth/doinst.sh
+++ b/multimedia/GoogleEarth/doinst.sh
@@ -1,8 +1,8 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-    ./usr/bin/update-desktop-database -q usr/share/applications
+    /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
 if [ -x /usr/bin/update-mime-database ]; then
-    ./usr/bin/update-mime-database usr/share/mime > /dev/null 2>&1
+    /usr/bin/update-mime-database usr/share/mime > /dev/null 2>&1
 fi