diff options
| author | Dave Jones <davej@redhat.com> | 2011-07-28 21:37:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-07-28 21:37:54 -0400 |
| commit | 4e3ef443626c58b42f64f3ecd4b3092458f21305 (patch) | |
| tree | 1253c75f0e7d73b402b647f92926d68bf0fa7b4f /kernel.spec | |
| parent | 35ffdcd40ec0fe800421cd251f16a85be845c0e7 (diff) | |
| download | kernel-4e3ef443626c58b42f64f3ecd4b3092458f21305.tar.gz kernel-4e3ef443626c58b42f64f3ecd4b3092458f21305.tar.xz kernel-4e3ef443626c58b42f64f3ecd4b3092458f21305.zip | |
module-init-tools needs to be a prereq not a conflict.
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index d8836c9f5..4c538137d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -431,7 +431,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 @@ -449,7 +449,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 # @@ -1873,6 +1873,9 @@ fi # and build. %changelog +* Thu Jul 28 2011 Dave Jones <davej@redhat.com> +- module-init-tools needs to be a prereq not a conflict. + * Wed Jul 27 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.0-git9 - Move CONFIG_JUMP_LABEL to config-generic now that powerpc has it too |