vanilla-%{kversion}

[Roland McGrath]

I find myself doing a lot of make prep lately in the days of frequent
new upstream base patches.  The untar still takes a lot longer than
the big patch.  So I committed this to speed it up for the repeated
rebase case.


Thanks,
Roland

Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.791
diff -u -r1.791 kernel.spec
--- kernel.spec	23 Jul 2008 19:51:09 -0000	1.791
+++ kernel.spec	24 Jul 2008 08:01:48 -0000
@@ -904,10 +904,19 @@
 %endif
 
 if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then
-  # Ok, first time we do a make prep.
-  rm -f pax_global_header
+
+  if [ -d kernel-%{kversion}/vanilla-%{kversion} ]; then
+    cd kernel-%{kversion}
+  else
+    # Ok, first time we do a make prep.
+    rm -f pax_global_header
 %setup -q -n kernel-%{kversion} -c
-  mv linux-%{kversion} vanilla-%{vanillaversion}
+    mv linux-%{kversion} vanilla-%{kversion}
+  fi
+
+%if "%{kversion}" != "%{vanillaversion}"
+  cp -rl vanilla-%{kversion} vanilla-%{vanillaversion}
+%endif
   cd vanilla-%{vanillaversion}
 
 # Update vanilla to the latest upstream.