From 116950af27a3d68aef28723477deb0adbe5ac672 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 11 Jan 2010 23:25:00 +0000
Subject: [PATCH] Fix bug 2930137: xCAT-rmc not installed correctly in aix
 snapshot

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

diff --git a/buildcore.sh b/buildcore.sh
index e0795cf82..34e96572a 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -113,7 +113,8 @@ if ! $GREP 'At revision' $SVNUP; then		# Use to be:  $GREP perl-xCAT $SVNUP; the
    mv $source/SRPMS/perl-xCAT-$VER*rpm $SRCDIR/
 fi
 if [ "$OSNAME" = "AIX" ]; then
-	echo "rpm -Uvh perl-xCAT-$VER-*rpm" > $DESTDIR/instxcat
+	# For the 1st one we overwrite, not append
+	echo "rpm -Uvh perl-xCAT-$SHORTVER*rpm" > $DESTDIR/instxcat
 fi
 
 if $GREP xCAT-client $SVNUP; then
@@ -125,8 +126,7 @@ if $GREP xCAT-client $SVNUP; then
    mv $source/SRPMS/xCAT-client-$VER*rpm $SRCDIR/
 fi
 if [ "$OSNAME" = "AIX" ]; then
-	# For the 1st one we overwrite, not append
-	echo "rpm -Uvh xCAT-client-$VER-*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-client-$SHORTVER*rpm" >> $DESTDIR/instxcat
 fi
 
 if $GREP xCAT-UI $SVNUP; then
@@ -139,7 +139,7 @@ if $GREP xCAT-UI $SVNUP; then
 fi
 # Do not automatically install xCAT-UI on AIX
 #if [ "$OSNAME" = "AIX" ]; then
-#	echo "rpm -Uvh xCAT-UI-$VER-*rpm" >> $DESTDIR/instxcat
+#	echo "rpm -Uvh xCAT-UI-$SHORTVER*rpm" >> $DESTDIR/instxcat
 #fi
 
 if $GREP xCAT-server $SVNUP; then
@@ -151,7 +151,7 @@ if $GREP xCAT-server $SVNUP; then
    mv $source/SRPMS/xCAT-server-$VER*rpm $SRCDIR
 fi
 if [ "$OSNAME" = "AIX" ]; then
-	echo "rpm -Uvh --nodeps xCAT-server-$VER-*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh --nodeps xCAT-server-$SHORTVER*rpm" >> $DESTDIR/instxcat
 fi
 
 if $GREP xCAT-rmc $SVNUP; then
@@ -217,8 +217,8 @@ if $GREP -E '^[UAD] +xCAT/' $SVNUP; then
 fi
 
 if [ "$OSNAME" = "AIX" ]; then
-	echo "rpm -Uvh xCAT-$VER-*rpm" >> $DESTDIR/instxcat
-	echo "rpm -Uvh xCAT-rmc-$VER-*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-$SHORTVER*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-rmc-$SHORTVER*rpm" >> $DESTDIR/instxcat
 	# add the service node bundle files 
 	cp xCATaixSN.bnd xCATaixSN2.bnd xCATaixSSH.bnd xCATaixSSL.bnd $DESTDIR/
 fi