rpms/kernel/devel/scripts rebase.sh,1.10,1.11

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4203/scripts

Modified Files:
	rebase.sh 
Log Message:
half assed rebase to git2.
Doesn't survive 'make prep' yet, as a means to deter people committing
to devel/ whilst we focus on F-8/




Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rebase.sh	12 Oct 2007 18:54:46 -0000	1.10
+++ rebase.sh	12 Oct 2007 22:37:27 -0000	1.11
@@ -41,7 +41,7 @@
   # "Stable version"
   export NEW=`echo $NEW | awk '{ print $10 }'`
 else
-  $NEW=$N
+  export NEW=`echo $NEW | awk '{ print $11 }'`
 fi
 
 export NEWBASE=`echo $NEW | sed s/-/\ /g | sed s/2\.6\.// | awk '{ print $1 }'`
@@ -72,7 +72,7 @@
   perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
 fi
 
-if [ "$NEWRC" -eq 0 ]; then
+if [ "$NEWRC" -eq 0 -a "$NEWGIT" -eq 0 ]; then
   echo "Rebasing from -rc to final release."
   perl -p -i -e 's/^%define\ released_kernel\ 0/\%define\ released_kernel\ 1/' kernel.spec
   export TARBALL_BASE=$(($OLDBASE-1))