rpms/kernel/devel kernel.spec,1.1912,1.1913

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Log Message:
* Fri Feb 05 2010 Kyle McMartin <kyle at redhat.com>
- If %with_firmware, continue with kernel-firmware, otherwise prereq on the
  separate linux-firmware pkg. Thanks to dzickus for noticing.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1912
retrieving revision 1.1913
diff -u -p -r1.1912 -r1.1913
--- kernel.spec	4 Feb 2010 17:53:14 -0000	1.1912
+++ kernel.spec	5 Feb 2010 20:44:28 -0000	1.1913
@@ -445,7 +445,11 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
+%if %{with_firmware}
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
+%else
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, linux-firmware, grubby >= 7.0.4-1
+%endif
 %if %{with_dracut}
 %define initrd_prereq  dracut >= 001-7
 %else
@@ -1971,6 +1975,10 @@ fi
 # and build.
 
 %changelog
+* Fri Feb 05 2010 Kyle McMartin <kyle at redhat.com>
+- If %with_firmware, continue with kernel-firmware, otherwise prereq on the
+  separate linux-firmware pkg. Thanks to dzickus for noticing.
+
 * Thu Feb 04 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.29.rc6.git4
 - 2.6.33-rc6-git4