rpms/kernel/devel kernel-2.6.spec, 1.1290, 1.1291 patch-2.6.12-rc3.bz2.sign, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	patch-2.6.12-rc3.bz2.sign 
Log Message:
conflict if older version of ipw firmware is present.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1290
retrieving revision 1.1291
diff -u -r1.1290 -r1.1291
--- kernel-2.6.spec	9 May 2005 22:57:29 -0000	1.1290
+++ kernel-2.6.spec	10 May 2005 01:14:09 -0000	1.1291
@@ -139,7 +139,7 @@
 # problems with the newer kernel or lack certain things that make 
 # integration in the distro harder than needed.
 #
-%define package_conflicts  cipe < 1.4.5, kudzu <= 0.92, initscripts < 7.23, dev < 3.2-7, iptables < 1.2.5-3, bcm5820 < 1.81, nvidia-rh72 <= 1.0
+%define package_conflicts  cipe < 1.4.5, kudzu <= 0.92, initscripts < 7.23, dev < 3.2-7, iptables < 1.2.5-3, bcm5820 < 1.81, nvidia-rh72 <= 1.0 ipw2200-firmware < 2.2
 
 #
 # Several packages had bugs in them that became obvious when the NPTL
@@ -1203,6 +1203,7 @@
 * Mon May  9 2005 Dave Jones <davej at redhat.com>
 - Rebase to 2.6.12-rc4
   | Xen builds are temporarily disabled again.
+- Conflict if old version of ipw firmware is present.
 
 * Fri May  6 2005 Dave Jones <davej at redhat.com>
 - Add PCI ID for new sundance driver. (#156859)


--- patch-2.6.12-rc3.bz2.sign DELETED ---