rpms/kernel/devel kernel-2.6.spec,1.1619,1.1620

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix ipw conflict



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1619
retrieving revision 1.1620
diff -u -r1.1619 -r1.1620
--- kernel-2.6.spec	20 Oct 2005 17:30:17 -0000	1.1619
+++ kernel-2.6.spec	20 Oct 2005 18:01:43 -0000	1.1620
@@ -132,7 +132,7 @@
 # problems with the newer kernel or lack certain things that make 
 # integration in the distro harder than needed.
 #
-%define package_conflicts kudzu <= 0.92, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.3 selinux-policy-targeted < 1.25.3-14
+%define package_conflicts kudzu <= 0.92, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.2 selinux-policy-targeted < 1.25.3-14
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -1265,6 +1265,7 @@
 %changelog
 * Thu Oct 20 2005 Dave Jones <davej at redhat.com>
 - 2.6.14-rc5
+- Aparently the ipw2200 drivers need 2.2 of the firmware right now.
 
 * Thu Oct 20 2005 David Woodhouse <dwmw2 at redhat.com>
 - Bring forward 8250 OpenFirmware probe patch from FC4.