Update to 0.6.2

1 files changed, 24 insertions, 15 deletions

diff --git a/dropbox-client/build/dropbox-client.SlackBuild b/dropbox-client/build/dropbox-client.SlackBuild
index 97bc494e..60841c20 100755
--- a/dropbox-client/build/dropbox-client.SlackBuild
+++ b/dropbox-client/build/dropbox-client.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2009  Eric Hameleers, Eindhoven, NL
+# Copyright (c) 2009,2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -38,6 +38,8 @@
 #               This package does not need nautilus to be installed, but in
 #               case you do have gnome, the package will integrate into the
 #               nautilus.
+# 0.6.2-1:    02/jun/2010 by Eric Hameleers <alien@slackware.com>
+#             * Updated.
 # 
 # Run 'sh dropbox-client.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -49,17 +51,10 @@
 
 PRGNAM=dropbox-client
 RPMNAM=nautilus-dropbox
-VERSION=${VERSION:-0.6.1}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-0.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
-# Don't mess with ARCH:
-if [ "$ARCH" != "x86_64" -a "$ARCH" != "i386" ]; then
-  echo "ARCH variable is set to '$ARCH' but only 'i386' or 'x86_64' is allowed!"
-  exit 1
-fi
-
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -68,8 +63,19 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i386 ;;
+    x86_64) export ARCH=x86_64 ;;
+    *) echo "Only x86 and x86_64 are supported platforms!"
+       exit 1
+       ;;
+  esac
+fi
+
 SOURCE="$SRCDIR/${RPMNAM}-${VERSION}-1.fc10.${ARCH}.rpm"
-SRCURL="http://linux.getdropbox.com/packages/${RPMNAM}-${VERSION}-1.fc10.${ARCH}.rpm"
+SRCURL="http://linux.dropbox.com/packages/${RPMNAM}-${VERSION}-1.fedora.${ARCH}.rpm"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -82,6 +88,10 @@ trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 set -u
 P1=${1:-1}
 
+# Save old umask and set to 0022:
+_UMASK_=$(umask)
+umask 0022
+
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
@@ -168,11 +178,7 @@ EOT
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $SRCDIR/$(basename $0) | sed \
-  -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \
-  -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \
-  -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \
-  > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
@@ -191,3 +197,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
+# Restore the original umask:
+umask ${_UMASK_}
+