rpms/kernel/devel/scripts rebase.sh,1.24,1.24.6.1

[Michael Young]

Author: myoung

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

Modified Files:
      Tag: private-myoung-dom0-branch
	rebase.sh 
Log Message:
Another pvops patch which fixes an smp mtrr bug



Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.24
retrieving revision 1.24.6.1
diff -u -r1.24 -r1.24.6.1
--- rebase.sh	14 Jan 2009 00:55:01 -0000	1.24
+++ rebase.sh	25 Feb 2009 21:26:03 -0000	1.24.6.1
@@ -72,14 +72,26 @@
 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.spec
+  perl -p -i -e 's/^%define\ rawhide_skip_docs\ 1/\%define\ rawhide_skip_docs\ 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.spec
   perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
 fi
 
+# make sure we build docs at least once per -rc kernel, shut it off otherwise
+if [ "$OLDRC" -ne 0 -a "$NEWRC" -gt "$OLDRC" ]; then
+  perl -p -i -e 's/^%define\ rawhide_skip_docs\ 1/\%define\ rawhide_skip_docs\ 0/' kernel.spec
+else
+  if [ "$NEWRC" -eq "$OLDRC" -a "$NEWGIT" -gt "$OLDGIT" ]; then
+    # common case, same -rc, new -git, make sure docs are off.
+    perl -p -i -e 's/^%define\ rawhide_skip_docs\ 0/\%define\ rawhide_skip_docs\ 1/' kernel.spec
+  fi
+fi
+
 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
+  perl -p -i -e 's/^%define\ rawhide_skip_docs\ 1/\%define\ rawhide_skip_docs\ 0/' 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