rpms/kernel/devel kernel-2.6.spec,1.1461,1.1462

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump requires/conflicts.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1461
retrieving revision 1.1462
diff -u -r1.1461 -r1.1462
--- kernel-2.6.spec	9 Aug 2005 03:55:45 -0000	1.1461
+++ kernel-2.6.spec	9 Aug 2005 04:12:04 -0000	1.1462
@@ -138,7 +138,7 @@
 # First the general kernel 2.6 required versions as per
 # Documentation/Changes
 #
-%define kernel_dot_org_conflicts  ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3
+%define kernel_dot_org_conflicts  ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2
 
 # 
 # Then a series of requirements that are distribution specific, either 
@@ -146,13 +146,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 ipw2200-firmware < 2.3 selinux-policy-targeted < 1.23.16-1
-
-#
-# Several packages had bugs in them that became obvious when the NPTL
-# threading code got integrated. 
-#
-%define nptl_conflicts SysVinit < 2.84-13, pam < 0.75-48, vixie-cron < 3.0.1-73, privoxy < 3.0.0-8, spamassassin < 2.44-4.8.x,  cups < 1.1.17-13
+%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
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -163,7 +157,7 @@
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 4.2.17-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 4.2.19-1
 
 Name: kernel
 Group: System Environment/Kernel
@@ -179,7 +173,6 @@
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
-Conflicts: %{nptl_conflicts}
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
@@ -411,7 +404,6 @@
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
-Conflicts: %{nptl_conflicts}
 # upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise
 # now that the smp kernel offers this capability, obsolete the old kernel
 Obsoletes: kernel-enterprise < 2.4.10
@@ -450,7 +442,6 @@
 Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
-Conflicts: %{nptl_conflicts}
 Conflicts: %{xen_conflicts}
 # the xen0 kernel needs a newer mkinitrd than everything else right now
 Conflicts: mkinitrd <= 4.2.0 
@@ -489,7 +480,6 @@
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
-Conflicts: %{nptl_conflicts}
 Conflicts: %{xen_conflicts}
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
@@ -1200,6 +1190,7 @@
 %changelog
 * Mon Aug 08 2005 Dave Jones <davej at redhat.com>
 - Various specfile cleanup.
+  - dropped dead patches, renamed some patches, updated package conflicts:
 - Improve megaraid compatiblity hack.
   (Now the legacy driver doesn't claim support for the drivers
    that the newer driver supports).