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

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Handling compression inside ApplyPatch function.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3215
retrieving revision 1.3216
diff -u -r1.3215 -r1.3216
--- kernel-2.6.spec	8 Jun 2007 20:28:27 -0000	1.3215
+++ kernel-2.6.spec	9 Jun 2007 00:43:54 -0000	1.3216
@@ -890,7 +890,11 @@
 
 ApplyPatch()
 {
-    patch -p1 -F1 -s < $RPM_SOURCE_DIR/$1
+  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" ;;
+  esac
 }
 
 %if %{using_upstream_branch}
@@ -898,7 +902,7 @@
 %else
 
 # Update to latest upstream.
-bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc4.bz2 | patch -p1 -F1 -s
+ApplyPatch patch-2.6.22-rc4.bz2
 
 %endif
 %if !%{nopatches}