rpms/kernel/devel kernel-2.6.spec,1.3216,1.3217

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Use loose_nonint_oldconfig for using_upstream_branch without nopatches



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3216
retrieving revision 1.3217
diff -u -r1.3216 -r1.3217
--- kernel-2.6.spec	9 Jun 2007 00:43:54 -0000	1.3216
+++ kernel-2.6.spec	9 Jun 2007 03:19:58 -0000	1.3217
@@ -272,6 +272,9 @@
 
 %if %{nopatches}
 %define with_modsign 0
+%endif
+
+%if %{nopatches}%{using_upstream_branch}
 # Ignore unknown options in our config-* files.
 # Some options go with patches we're not applying.
 %define oldconfig_target loose_nonint_oldconfig
@@ -888,12 +891,13 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
+patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {
   case "$1" in
-  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$1" | patch -p1 -F1 -s ;;
-  *.gz) gunzip < "$RPM_SOURCE_DIR/$1" | patch -p1 -F1 -s ;;
-  *) patch -p1 -F1 -s < "$RPM_SOURCE_DIR/$1" ;;
+  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$1" | $patch_command ;;
+  *.gz) gunzip < "$RPM_SOURCE_DIR/$1" | $patch_command ;;
+  *) $patch_command < "$RPM_SOURCE_DIR/$1" ;;
   esac
 }