rpms/kernel/devel kernel.spec,1.1915,1.1916

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Log Message:
* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
- Don't want linux-firmware if %with_firmware, yet. (Think F-11/F-12 2.6.33)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1915
retrieving revision 1.1916
diff -u -p -r1.1915 -r1.1916
--- kernel.spec	5 Feb 2010 23:08:30 -0000	1.1915
+++ kernel.spec	6 Feb 2010 17:10:15 -0000	1.1916
@@ -445,7 +445,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, linux-firmware, grubby >= 7.0.10-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.10-1
 %if %{with_dracut}
 %define initrd_prereq  dracut >= 001-7
 %else
@@ -469,6 +469,8 @@ Requires(pre): %{kernel_prereq}\
 Requires(pre): %{initrd_prereq}\
 %if %{with_firmware}\
 Requires(pre): kernel-firmware >= %{rpmversion}-%{pkg_release}\
+%else\
+Requires(pre): linux-firmware\
 %endif\
 Requires(post): /sbin/new-kernel-pkg\
 Requires(preun): /sbin/new-kernel-pkg\
@@ -1977,6 +1979,9 @@ fi
 # and build.
 
 %changelog
+* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
+- Don't want linux-firmware if %with_firmware, yet. (Think F-11/F-12 2.6.33)
+
 * Fri Feb 05 2010 Peter Jones <pjones at redhat.com>
 - Move initrd creation to %%posttrans
   Resolves: rhbz#557922