From 35fd6cdc465e25444c303e5a0714d1b75b79a873 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 6 Jun 2008 21:41:09 +0000
Subject: [PATCH] -Fix makeserverrpm for 2.1, was missing files

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1595 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 makeserverrpm | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/makeserverrpm b/makeserverrpm
index 989a04c81..12c9bbab0 100755
--- a/makeserverrpm
+++ b/makeserverrpm
@@ -1,35 +1,30 @@
 #!/bin/sh
 
 OSNAME=$(uname)
-VER="2.1"
+VER=2.1
 
 if [ "$OSNAME" = "AIX" ]
 then
 
-        source=$PWD
-        cd /opt/freeware/src/packages/SOURCES
-        rm -f xCAT-server-$VER; ln -s $source/xCAT-server xCAT-server-$VER
-        rm -f /opt/freeware/src/packages/SRPMS/xCAT-server*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-server*rpm
-        echo '.svn' > /tmp/xcat-excludes
-        tar -X /tmp/xcat-excludes -cf xCAT-server-$VER.tar xCAT-server-$VER
-        gzip -f /opt/freeware/src/packages/SOURCES/xCAT-server-$VER.tar
-        cd $source/xCAT-server
-        rpm -ba xCAT-server.spec
+	echo '.svn' > /tmp/xcat-excludes
+    tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/xCAT-server-$VER.tar xCAT-server
+    gzip -f /opt/freeware/src/packages/SOURCES/xCAT-server-$VER.tar
+    cd ./xCAT-server
+    rm -f /opt/freeware/src/packages/SRPMS/xCAT-server-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-server-$VER*rpm
+    rpm -ba xCAT-server.spec
+    #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-server-$VER*rpm
+
 else
+
 	if [ -f /etc/redhat-release ]
 	then
    		pkg="redhat"
 	else
    		pkg="packages"
 	fi
-	source=$PWD
 
-	# Trying to avoid having the version  on the xCAT-server dir name in svn
-	set -x
-	cd /usr/src/$pkg/SOURCES
-	rm -f xCAT-server-$VER; ln -s $source/xCAT-server xCAT-server-$VER   # have to make tar think it is in xCAT-server-2.1
-	rm -f xCAT-server-$VER.tar.gz
-	tar -czhf xCAT-server-$VER.tar.gz --exclude=.svn --exclude=.project xCAT-server-$VER
+	tar  --exclude .svn -czf /usr/src/$pkg/SOURCES/xCAT-server-$VER.tar.gz xCAT-server;
 	rm -f /usr/src/$pkg/SRPMS/xCAT-server-$VER*rpm /usr/src/$pkg/RPMS/noarch/xCAT-server-$VER*rpm
-	rpmbuild -ta xCAT-server-$VER.tar.gz
+	rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-server-$VER.tar.gz ;
+	#rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-server-$VER*rpm
 fi