[ofa-general] [PATCH 2/2] management/make.dist: Handle .spec files differently

[Hal Rosenstock]

management/make.dist: Handle .spec files differently

No longer checkin .spec files and remove them after tarball is created.

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

diff --git a/make.dist b/make.dist
index 99481de..f65c7e2 100755
--- a/make.dist
+++ b/make.dist
@@ -24,10 +24,10 @@ echo "code as released before even if yo
 echo "around."
 echo
 echo "	As part of this process, the script will parse the <target>.spec.in"
-echo "file and output a <target>.spec file and check that into the git repo"
-echo "so it is included in the tag.  Since this script isn't smart enough"
-echo "to deal with other random changes that should have their own checkin,"
-echo "the script will refuse to run if the current repo state is not clean."
+echo "file and output a <target>.spec file.  Since this script isn't smart"
+echo "enough to deal with other random changes that should have their own" 
+echo "checkin the script will refuse to run if the current repo state is not"
+echo "clean."
 echo
 echo "	NOTE: the script has no clue if you are tagging on the right branch,"
 echo "it will however show you the git branch output so you can confirm it"
@@ -107,7 +107,7 @@ for target in $TARGETS; do
 	else
 		TARBALL=$target-$VERSION.tgz
 	fi
-	sed -e 's/@VERSION@/'$VERSION'/;s/@RELEASE@/'$RELEASE'/;s/@TARBALL@/'$TARBALL'/' < $target/$target.spec.in > $target/$target.spec
+	sed -e 's/@VERSION@/'$VERSION'/;s/@RELEASE@/'$RELEASE'/' < $target/$target.spec.in > $target/$target.spec
 	cp -a $target $target-$VERSION
 	echo "Creating $TMPDIR/$TARBALL"
 	tar -czf $TMPDIR/$TARBALL --exclude=.git $target-$VERSION
@@ -115,11 +115,10 @@ for target in $TARGETS; do
 done
 
 if [ $1 = release ]; then
-	echo "Checking in modified spec files and tagging release."
+	echo "Removing modified spec files and tagging release."
 	for target in $TARGETS; do
-		git add $target/$target.spec
+		rm -rf $target/$target.spec
 	done
-	git commit -m "Automatic check-in of target spec files after version processing"
 	for target in $TARGETS; do
 		VERSION=`grep "AC_INIT.*$target" $target/configure.in | cut -f 2 -d ',' | sed -e 's/ //g'`
 		if [ ! -z "$2" ]; then
@@ -134,4 +133,3 @@ if [ $1 = release ]; then
 	done
 fi
 
-