librsync and duplicity update

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

2 files changed, 27 insertions, 4 deletions

diff --git a/duplicity/duplicity.build b/duplicity/duplicity.build
index d29cc087..4fa1efcd 100755
--- a/duplicity/duplicity.build
+++ b/duplicity/duplicity.build
@@ -6,6 +6,21 @@
 #   ARCH=x86_64 slacktrack -jefkzp "duplicity-0.4.2-x86_64-1rha.tgz" "./duplicity.build"
 # 
 
+cat << EOCAT
+You'll need to have following package installed:
+
+  librsync
+
+EOCAT
+
+if [ "$INTERACT" != "no" ]; then
+  echo "Hit ENTER do continue, Crtl-C to abort"
+  read crap
+else
+  echo sleeping 3 seconds...
+  sleep 3
+fi
+
 CWD="`pwd`"
 
 if [ -f "/etc/slackbuildrc" ]; then
diff --git a/librsync/librsync.SlackBuild b/librsync/librsync.SlackBuild
index f7fe131e..5c85d6d6 100755
--- a/librsync/librsync.SlackBuild
+++ b/librsync/librsync.SlackBuild
@@ -20,6 +20,7 @@ VERSION=${VERSION:=0.9.7}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
+REPOS=${REPOS:=$TMP}
 
 if [ "$ARCH" == "x86_64" ]; then
   LIBDIR=/usr/lib64
@@ -39,14 +40,17 @@ else
   tarflag="z"
 fi
 
+SRC_DIR="$SRC_DIR/$PACKAGE"
+mkdir -p $SRC_DIR
+
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
   wget "$URL" -O "$SRC_DIR/$SRC"
 fi
 
+TMP="$TMP/$PACKAGE"
+rm -rf $TMP
+mkdir -p $TMP
 cd $TMP
-rm -rf package-$PACKAGE
-mkdir package-$PACKAGE
-cd package-$PACKAGE
 
 tar xvf$tarflag $SRC_DIR/$SRC
 cd $PACKAGE-$VERSION
@@ -94,5 +98,9 @@ done
 
 echo 'chroot . /sbin/ldconfig' > install/doinst.sh
 
-makepkg -c y -l y $TMP/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+
+if [ "$CLEANUP" == "yes" ]; then
+  rm -rf $TMP
+fi