rpms/kernel/devel kernel-2.6.spec,1.2353.2.1,1.2353.2.2

[fedora-cvs-commits at redhat.com]

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25897

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
trying out the new rhel-config option stuff



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.1
retrieving revision 1.2353.2.2
diff -u -r1.2353.2.1 -r1.2353.2.2
--- kernel-2.6.spec	5 Jul 2006 20:14:55 -0000	1.2353.2.1
+++ kernel-2.6.spec	5 Jul 2006 21:08:21 -0000	1.2353.2.2
@@ -26,7 +26,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo %${RR%%?})%{dist}_don
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}_don
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage
@@ -208,6 +208,7 @@
 Source12: built-in-where
 Source13: make-symsets
 Source14: find-provides
+Source15: merge.pl
 
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
@@ -235,6 +236,8 @@
 #Source67: kernel-%{kversion}-sparc64.config
 #Source68: kernel-%{kversion}-sparc64-smp.config
 
+Source80: config-rhel-generic
+
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
@@ -641,6 +644,15 @@
 
 
 %prep
+#if a rhel kernel, apply the rhel config options
+%if 0%{?rhel}
+  for i in kernel*.config
+  do
+    mv $i $i.tmp
+    ./merge.pl config-rhel-generic $i.tmp > $i
+  done
+%endif  
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -972,7 +984,6 @@
 
 cp -f %{all_arch_configs} .
 
-
 # now run oldconfig over all the config files
 for i in *.config
 do