rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

module-init-tools needs to be a prereq not a conflict.

Browse Source
This commit is contained in:
Dave Jones 2011-07-28 21:37:54 -04:00
parent 35ffdcd40e
commit 4e3ef44362
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -431,7 +431,7 @@ Summary: The Linux kernel
# First the general kernel 2.6 required versions as per # First the general kernel 2.6 required versions as per
# Documentation/Changes # 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 # 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 # Packages that need to be installed before the kernel is, because the %%post
# scripts use them. # 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 %define initrd_prereq dracut >= 001-7
# #
@ -1873,6 +1873,9 @@ fi
# and build. # and build.
%changelog %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> * Wed Jul 27 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.0-git9 - Linux 3.0-git9
- Move CONFIG_JUMP_LABEL to config-generic now that powerpc has it too - Move CONFIG_JUMP_LABEL to config-generic now that powerpc has it too