rpms/kernel/devel kernel.spec,1.1714,1.1715

[Dennis Gilmore]

Author: ausil

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

Modified Files:
	kernel.spec 
Log Message:
have kernel obsolete kernel-smp on sparc64
Require grubby >= 7.0.2-1  it provides the dracut options we need



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1714
retrieving revision 1.1715
diff -u -p -r1.1714 -r1.1715
--- kernel.spec	12 Aug 2009 21:13:59 -0000	1.1714
+++ kernel.spec	12 Aug 2009 21:42:32 -0000	1.1715
@@ -430,7 +430,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, grubby >= 7.0.2-1
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -470,7 +470,7 @@ ExclusiveArch: noarch %{all_x86} x86_64 
 ExclusiveOS: Linux
 
 %kernel_reqprovconf
-%ifarch x86_64
+%ifarch x86_64 sparc64
 Obsoletes: kernel-smp
 %endif
 
@@ -1980,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Dennis Gilmore <dennis at ausil.us>
+- Obsolete kernel-smp on sparc64
+- Require grubby >= 7.0.2-1 since thats what introduces the dracut options we use
+
 * Wed Aug 12 2009 Kristian Høgsberg <krh at redhat.com>
 - Fix drm-page-flip.patch to not break radeon kms and to not reset
   crtc offset into fb on flip.