another clean up attempt

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index 944187d..f0a32ab 100644 (file)
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -467,15 +467,25 @@ mkdir -p $RPM_BUILD_ROOT/boot
 BuildKernel %make_target %kernel_arch
 %endif
 
-%if %{buildsmp} && "%{_target_cpu}" == "i686"
+%if "%{_target_cpu}" == "i686"
+%if %{buildsmp} 
 BuildKernel %make_target %kernel_arch smp
+%endif
+
+%if %{builduml}
 BuildKernel linux um uml
+%endif
+
+%if %{buildxen}
 BuildKernel vmlinuz %kernel_arch xenU
 %endif
+%endif
 
-%if %{buildsmp} && "%{_target_cpu}" == "x86_64"
+%if "%{_target_cpu}" == "x86_64"
+%if %{buildsmp} 
 BuildKernel %make_target %kernel_arch smp
 %endif
+%endif
 
 ###
 ### install