rpms/kernel/devel/scripts rebase.sh,1.20,1.21

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	rebase.sh 
Log Message:
2.6.26-rc7


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rebase.sh	15 Jun 2008 17:04:28 -0000	1.20
+++ rebase.sh	21 Jun 2008 02:06:46 -0000	1.21
@@ -126,6 +126,7 @@
   perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .cvsignore
   perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' upstream
   grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 sources > .sources.tmp; mv .sources.tmp sources
+  grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
   if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 upstream` -eq 0 ]; then
     echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .cvsignore
     echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> upstream