--- ../../../rpms_mod/kernel/SPECS/kernel-2.6.spec	2007-09-29 07:40:48.000000000 -0500
+++ ../SPECS/kernel-2.6.spec	2007-09-29 07:41:08.000000000 -0500
@@ -20,7 +20,7 @@ Summary: The Linux kernel (the core of t
 # After branching, please hardcode these values as the
 # %dist and %rhel tags are not reliable yet
 # For example dist -> .el5 and rhel -> 5
-%define dist .el5
+%define dist .el5.centos.plus
 %define rhel 5
 
 #
@@ -52,7 +52,7 @@ Summary: The Linux kernel (the core of t
 %endif
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
-%define all_x86 i386 i686
+%define all_x86 i386 i586 i686
 # we differ here b/c of the reloc patches
 %ifarch i686 x86_64
 %define buildkdump 0
@@ -1152,39 +1152,6 @@ against the kdump kernel package.
 
 
 %prep
-#if a rhel kernel, apply the rhel config options
-%if 0%{?rhel}
-  for i in %{all_arch_configs}
-  do
-    mv $i $i.tmp
-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
-    rm $i.tmp
-  done
-  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config
-  do
-    echo i is this file  $i
-    mv $i $i.tmp
-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-x86-generic $i.tmp > $i
-    rm $i.tmp
-  done
-  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64.config
-  do
-    echo i is this file  $i
-    mv $i $i.tmp
-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-ppc64-generic $i.tmp > $i
-    rm $i.tmp
-  done
-%endif
-#if a olpc kernel, apply the olpc config options
-%if 0%{?olpc}
-  for i in %{all_arch_configs}
-  do
-    mv $i $i.tmp
-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-olpc-generic $i.tmp > $i
-    rm $i.tmp
-  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.
@@ -1988,7 +1955,7 @@ cp -f %{all_arch_configs} .
 # don't need these for relocatable kernels
 rm -f kernel-%{kversion}-{i686,x86_64}-kdump.config
 # don't need these in general
-rm -f kernel-%{kversion}-i586.config
+#rm -f kernel-%{kversion}-i586.config
 %endif
 
 %if 0%{?olpc}
#@@ -2811,6 +2778,12 @@ This is required to use SystemTap with %
# %endif
#  
# %changelog
#+* Sun Sep 18 2007 Johnny Hughes <johnny@centos.org> [2.6.18.8-1.10.el5.centos.plus]
#+- Modified to build an i586 kernel
#+- added new config files for i586, i686, x86_64 with extra features turned on
#+  including all Network Adapters, all Video4Linux adapers, all Radio devices,
#+  JFS, NTFS, ReiserFS, FUSE, NCP (Novell partitions) and LDM (Windows Dynamic Partitions).
#+
# * Thu Sep 13 2007 Karanbir Singh <kbsingh@centos.org> [2.6.18-8.1.10.el5.centos]
# - Change gpg key to CentOS
#