rpms/kernel/devel/scripts rebase.sh,1.2,1.3 reconfig.sh,1.6,1.7

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rebase.sh reconfig.sh 
Log Message:
Rename kernel-2.6.spec to kernel.spec


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rebase.sh	10 Jul 2007 16:08:19 -0000	1.2
+++ rebase.sh	12 Jul 2007 20:16:33 -0000	1.3
@@ -52,15 +52,15 @@
 
 if [ "$OLDRC" -eq 0 -a "$OLDGIT" -eq 0 -a "$OLDGIT" -ne "$NEWGIT" ]; then
   echo "Rebasing from a stable release to a new git snapshot"
-  perl -p -i -e 's/^%define\ released_kernel\ 1/\%define\ released_kernel\ 0/' kernel-2.6.spec
+  perl -p -i -e 's/^%define\ released_kernel\ 1/\%define\ released_kernel\ 0/' kernel.spec
   # force these to zero in this case, they may not have been when we rebased to stable
-  perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel-2.6.spec
-  perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel-2.6.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
 fi
 
 if [ "$OLDRC" != "$NEWRC" ]; then
   echo "Different rc. Rebasing from $OLDRC to $NEWRC"
-  perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ $ENV{"NEWRC"}/' kernel-2.6.spec
+  perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ $ENV{"NEWRC"}/' kernel.spec
   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
@@ -73,7 +73,7 @@
   else
     echo "Different git. Rebasing from git$OLDGIT to git$NEWGIT"
   fi
-  perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ $ENV{"NEWGIT"}/' kernel-2.6.spec
+  perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ $ENV{"NEWGIT"}/' kernel.spec
   if [ "$OLDGIT" -ne 0 ]; then
     perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .cvsignore
     perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' upstream
@@ -95,6 +95,6 @@
 fi
 
 #TODO: Call this only if we changed version.
-bumpspecfile.py kernel-2.6.spec "- $NEW"
+bumpspecfile.py kernel.spec "- $NEW"
 make clog
 


Index: reconfig.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/reconfig.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- reconfig.sh	10 Jul 2007 00:50:58 -0000	1.6
+++ reconfig.sh	12 Jul 2007 20:16:33 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-V=$(grep "%define base_sublevel" kernel-2.6.spec | head -n1 | awk '{ print $3 }')
+V=$(grep "%define base_sublevel" kernel.spec | head -n1 | awk '{ print $3 }')
 
 cd kernel-2.6.$V/linux-2.6.$V.noarch/
 rm -f kernel-*.config