rpms/kernel/devel kernel.spec,1.1239,1.1240

[Bill Nottingham]

Author: notting

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

Modified Files:
	kernel.spec 
Log Message:
Conflict with older squashfs-tools.



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1239
retrieving revision 1.1240
diff -u -r1.1239 -r1.1240
--- kernel.spec	28 Jan 2009 07:50:25 -0000	1.1239
+++ kernel.spec	28 Jan 2009 15:46:39 -0000	1.1240
@@ -409,7 +409,7 @@
 # problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
-%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.