rpms/kernel/devel kernel.spec,1.1499,1.1500

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
copy sanity checking and build fixes from F-11


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1499
retrieving revision 1.1500
diff -u -r1.1499 -r1.1500
--- kernel.spec	2 Apr 2009 17:36:42 -0000	1.1499
+++ kernel.spec	3 Apr 2009 05:04:00 -0000	1.1500
@@ -916,6 +916,9 @@
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1;
   fi
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+    [ "${patch:0:10}" != "patch-2.6." ] && echo "Patch $patch not listed in specfile" && exit 1;
+  fi
   case "$patch" in
   *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
   *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
@@ -1577,7 +1580,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{with_debug}
-%if !%{with_up}
+%if %{with_up}
 BuildKernel %make_target %kernel_image debug
 %endif
 %if %{with_pae}
@@ -1875,7 +1878,9 @@
 
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
+%if %{with_up}
 %kernel_variant_files %{with_debug} debug
+%endif
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
 %kernel_variant_files -k vmlinux %{with_kdump} kdump