rpms/kernel/devel kernel-2.6.spec,1.1568,1.1569

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Sep 22 21:25:15 UTC 2005


Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Reset some conflicts: to earlier revisions.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1568
retrieving revision 1.1569
diff -u -r1.1568 -r1.1569
--- kernel-2.6.spec	22 Sep 2005 09:54:24 -0000	1.1568
+++ kernel-2.6.spec	22 Sep 2005 21:25:12 -0000	1.1569
@@ -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 < 1.1.119-1, initscripts < 8.11.1-1, 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.3 selinux-policy-targeted < 1.25.3-14
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -1242,6 +1242,9 @@
 %endif
 
 %changelog
+* Thu Sep 22 2005 Dave Jones <davej at redhat.com>
+- Reset some conflicts: to earlier revisions.
+
 * Thu Sep 22 2005 David Woodhouse <dwmw2 at redhat.com>
 - Fix G5 boot by avoiding EEH checks
 




More information about the fedora-cvs-commits mailing list