--- trunk/mage/usr/lib/mage/smage2.sh	2007/11/05 17:08:33	600
+++ trunk/mage/usr/lib/mage/smage2.sh	2007/11/28 10:47:50	635
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.60 2007-11-05 17:08:33 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -452,10 +452,13 @@
 			unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
 			;;
 		rpm)
-			pushd ${BUILDDIR} > /dev/null
+			pushd ${DEST} > /dev/null
 			rpm2targz ${SOURCEDIR}/${PNAME}/${SRCFILE} || die "rpm2targz: .rpm unpack failed."
-			tar --no-same-owner -xvzf ${SRCFILE/.rpm/.tar.gz/} || die "tar: .rpm unpack failed."
-			[[ -f ${BUILDDIR}/${SRCFILE/.rpm/.tar.gz/} ]] && rm ${BUILDDIR}/${SRCFILE/.rpm/.tar.gz/}
+			tar --no-same-owner -xvzf ${SRCFILE/.rpm/.tar.gz} || die "tar: .rpm unpack failed."
+			if [[ -f ${DEST}/${SRCFILE/.rpm/.tar.gz} ]]
+			then
+				rm ${DEST}/${SRCFILE/.rpm/.tar.gz}
+			fi
 			;;
 		*)
 			die "munpack failed"
@@ -683,7 +686,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.60 2007-11-05 17:08:33 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state