rpms/kernel/devel kernel-2.6.spec,1.1659,1.1660

[fedora-cvs-commits at redhat.com]

Author: notting

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

Modified Files:
	kernel-2.6.spec 
Log Message:
another day, another driver, another firmware version



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1659
retrieving revision 1.1660
diff -u -r1.1659 -r1.1660
--- kernel-2.6.spec	10 Nov 2005 20:28:14 -0000	1.1659
+++ kernel-2.6.spec	11 Nov 2005 05:56:57 -0000	1.1660
@@ -136,7 +136,7 @@
 # problems with the newer kernel or lack certain things that make 
 # integration in the distro harder than needed.
 #
-%define package_conflicts kudzu < 1.2.5, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.2 selinux-policy-targeted < 1.25.3-14
+%define package_conflicts kudzu < 1.2.5, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -1285,6 +1285,9 @@
 %endif
 
 %changelog
+* Fri Nov 11 2005 Bill Nottingham <notting at redhat.com>
+- ipw2200 requires a new firmware version, tweak conflict
+
 * Thu Nov 10 2005 Dave Jones <davej at redhat.com>
 - 2.6.14-git13