From c486e64596db92a4319f48f27832fd7ff8cc639d Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 30 Oct 2009 02:23:23 +0000
Subject: Clean up dist-tools, remove or update.

svn path=/branches/BRANCH_6-3/; revision=5446
---
 dist-tools/shipper/buildrpms | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'dist-tools/shipper')

diff --git a/dist-tools/shipper/buildrpms b/dist-tools/shipper/buildrpms
index e3c08c2b..11b3ddfd 100755
--- a/dist-tools/shipper/buildrpms
+++ b/dist-tools/shipper/buildrpms
@@ -24,6 +24,8 @@ sed "s|~/.rpmmacros|$MACROFILE|" /usr/lib/rpm/rpmrc >"$RCFILE"
 echo "%_topdir $TMPDIR" >"$MACROFILE"
 echo "%_topdir $TMPDIR" >"$MACROFILE"
 
+ARCH=--target=$(uname -m)
+
 #  build RPMs
 rpmbuild --rcfile "$RCFILE" $ARCH -ta $TARBALL \
 || rpm --rcfile "$RCFILE" $ARCH -ta $TARBALL
@@ -31,9 +33,9 @@ status=$?
 
 if [ $status = '0' ]
 then
-    # copy RPMs to this directory
-    cp "$TMPDIR"/RPMS/*/*.rpm .
-    cp "$TMPDIR"/SRPMS/*.rpm .
+    # move RPMs to this directory
+    mv "$TMPDIR"/RPMS/*/*.rpm .
+    mv "$TMPDIR"/SRPMS/*.rpm .
 fi
 
 #  clean up build directory
-- 
cgit v1.2.3