rpms/kernel/devel/scripts rebase.sh,1.22,1.23

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7199/scripts

Modified Files:
	rebase.sh 
Log Message:
2.6.27


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rebase.sh	29 Jul 2008 04:16:47 -0000	1.22
+++ rebase.sh	10 Oct 2008 00:26:04 -0000	1.23
@@ -80,31 +80,31 @@
 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))
-  perl -p -i -e 's/^%define\ base_sublevel\ $ENV{TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
+  export OLD_TARBALL_BASE=$(($OLDBASE-1))
+  perl -p -i -e 's/^%define\ base_sublevel\ $ENV{OLD_TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
   perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
   perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
 
-  grep -v kernel-2.6.$TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
+  grep -v kernel-2.6.$OLD_TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
   echo kernel-2.6.$NEWBASE >> .cvsignore
 
   for i in upstream sources .cvsignore
   do
-   grep -v linux-2.6.$(($OLDBASE-1)).tar.bz2 $i > .$i.tmp; mv .$i.tmp $i
+   grep -v linux-2.6.$OLD_TARBALL_BASE.tar.bz2 $i > .$i.tmp; mv .$i.tmp $i
    grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 $i > .$i.tmp; mv .$i.tmp $i
    grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 $i > .$i.tmp; mv .$i.tmp $i
   done
 
-  echo linux-2.6.$TARBALL_BASE.tar.bz2 >> upstream
+  echo linux-2.6.$NEWBASE.tar.bz2 >> upstream
 
-  rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2
-  rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2.sign
+  rm -f linux-2.6.$OLD_TARBALL_BASE.tar.bz2
+  rm -f linux-2.6.$OLD_TARBALL_BASE.tar.bz2.sign
   rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2
   rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
   rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2
   rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
 
-  cvs remove linux-2.6.$(($OLDBASE-1)).tar.bz2.sign
+  cvs remove linux-2.6.$OLD_TARBALL_BASE.tar.bz2.sign
   cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
   cvs remove patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign