From 637486f053f6f0f27053b856bddaf1121d7071cf Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 23 Dec 2009 11:54:00 +0000
Subject: [PATCH] Fixed bug 2919401 - multiple versions of the xCAT rpm in the
 aix tarball

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4846 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 buildcore.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildcore.sh b/buildcore.sh
index 382e2db91..6820869b3 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -55,6 +55,7 @@ REL=`basename $D`
 XCATCORE="xcat-core"
 svn up Version
 VER=`cat Version`
+SHORTVER=`cat Version|cut -d. -f 1,2`
 if [ "$PROMOTE" = 1 ]; then
 	CORE="xcat-core"
 	if [ "$OSNAME" = "AIX" ]; then
@@ -180,8 +181,8 @@ fi
 if [ "$OSNAME" != "AIX" ]; then
 	if $GREP -E '^[UAD] +xCATsn/' $SVNUP; then
 	   UPLOAD=1
-	   rm -f $DESTDIR/xCATsn-$REL*rpm
-	   rm -f $SRCDIR/xCATsn-$REL*rpm
+	   rm -f $DESTDIR/xCATsn-$SHORTVER*rpm
+	   rm -f $SRCDIR/xCATsn-$SHORTVER*rpm
 	   ./makexcatsnrpm x86_64
 	   mv $source/RPMS/*/xCATsn-$VER*rpm $DESTDIR
 	   mv $source/SRPMS/xCATsn-$VER*rpm $SRCDIR
@@ -196,8 +197,8 @@ fi
 
 if $GREP -E '^[UAD] +xCAT/' $SVNUP; then
    UPLOAD=1
-   rm -f $DESTDIR/xCAT-$REL*rpm
-   rm -f $SRCDIR/xCAT-$REL*rpm
+   rm -f $DESTDIR/xCAT-$SHORTVER*rpm
+   rm -f $SRCDIR/xCAT-$SHORTVER*rpm
 	if [ "$OSNAME" = "AIX" ]; then
 	   ./makexcatrpm
 	   mv $source/RPMS/*/xCAT-$VER*rpm $DESTDIR