From 73a609865cb91aa05397988289f1f82fd561e389 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Jul 29 2011 01:36:33 +0000 Subject: module-init-tools needs to be a prereq, not a conflict. --- diff --git a/kernel.spec b/kernel.spec index 2f5a0c7..4c3c419 100644 --- a/kernel.spec +++ b/kernel.spec @@ -432,7 +432,7 @@ Summary: The Linux kernel # First the general kernel 2.6 required versions as per # Documentation/Changes # -%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, module-init-tools < 3.13-1, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5 +%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, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5 # # Then a series of requirements that are distribution specific, either @@ -450,7 +450,7 @@ Summary: The Linux kernel # Packages that need to be installed before the kernel is, because the %%post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.10-1 +%define kernel_prereq fileutils, module-init-tools >= 3.16-2, initscripts >= 8.11.1-1, grubby >= 7.0.10-1 %define initrd_prereq dracut >= 001-7 # @@ -1889,6 +1889,9 @@ fi # and build. %changelog +* Thu Jul 28 2011 Dave Jones +- module-init-tools needs to be a prereq, not a conflict. + * Thu Jul 28 2011 Josh Boyer - Backport patch to correct udlfb removal events (rhbz 726163)