rpms/kernel/devel/scripts rebase.sh,1.5,1.6

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rebase.sh 
Log Message:
Nuke prior rc patch bits from .cvsignore, upstream and sources when running rebase.sh


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rebase.sh	4 Aug 2007 05:09:35 -0000	1.5
+++ rebase.sh	5 Aug 2007 02:58:03 -0000	1.6
@@ -23,11 +23,11 @@
   fi
 fi
 
-# Is there a new snapshot ?
+# Is there a new snapshot or prepatch ?
 NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "snapshot for the stable"`
-if [ "${?}" != 0 ] ; then
+if [ -z "$NEW" ] ; then
   NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"`
-  if [ "${?}" != 0 ] ; then
+  if [ -z "$NEW" ] ; then
     echo "No new rc or git snapshot of stable branch".
     exit
   fi
@@ -64,6 +64,9 @@
 if [ "$OLDRC" != "$NEWRC" ]; then
   echo "Different rc. Rebasing from $OLDRC to $NEWRC"
   perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ $ENV{"NEWRC"}/' kernel.spec
+  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
   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