gnupg update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@8 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/patches/gnupg/gnupg.SlackBuild b/patches/gnupg/gnupg.SlackBuild
index a562a69959511ffe93d41fb68b4e41dce83b2971..bbe0b5a969ee922111f4436440b85c3dc3b2609c 100755 (executable)
--- a/patches/gnupg/gnupg.SlackBuild
+++ b/patches/gnupg/gnupg.SlackBuild
@@ -20,6 +20,7 @@ ARCH=${ARCH:=x86_64}
 BUILD=${BUILD:=1rha}
 TMP=${TMP:=/tmp}
 SRC_DIR=${SRC:=$CWD}
+REPOS=${REPOS:=$TMP}
 
 if [ "$ARCH" == "x86_64" ]; then
   LIBDIR=/usr/lib64
@@ -27,8 +28,6 @@ else
   LIBDIR=/usr/lib
 fi
 
-PKG=$TMP/package-gnupg
-
 # signing key from http://www.gnupg.org/(en)/signature_key.html
 gpg --import << EOGPG
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -293,6 +292,9 @@ else
   tarflag="z"
 fi
 
+SRC_DIR="$SRC_DIR/$PACKAGE"
+mkdir -p $SRC_DIR
+
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
   rm -f $SRC_DIR/$SRC.sig
   wget "$URL" -O "$SRC_DIR/$SRC"
@@ -312,10 +314,9 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
 fi
 
-if [ ! -d $TMP ]; then
-  mkdir -p $TMP # location to build the source
-fi
-rm -rf $PKG
+TMP="$TMP/$PACKAGE"
+PKG="$TMP/package-gnupg"
+rm -rf $TMP
 mkdir -p $PKG
 
 cd $TMP
@@ -355,7 +356,7 @@ cat $CWD/slack-desc.gnupg > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/gnupg-$VERSION-$ARCH-$BUILD.tgz
+makepkg -l y -c n $REPOS/gnupg-$VERSION-$ARCH-$BUILD.tgz
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then