rpms/kernel/devel kernel.spec,1.791,1.792

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	kernel.spec 
Log Message:
Cache vanilla between untar and upstream patch.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- kernel.spec	23 Jul 2008 19:51:09 -0000	1.791
+++ kernel.spec	24 Jul 2008 08:02:22 -0000	1.792
@@ -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.