diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-06-06 16:20:39 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-06-06 16:20:39 -0400 |
| commit | 930327525a416c9e56fea784d673fce21056b4cd (patch) | |
| tree | ed1632f3be9393dcbca4000a891ea8313a830454 /kernel.spec | |
| parent | 911cdc530b047423ab87a424b3be90a52d109aa6 (diff) | |
| download | kernel-930327525a416c9e56fea784d673fce21056b4cd.tar.gz kernel-930327525a416c9e56fea784d673fce21056b4cd.tar.xz kernel-930327525a416c9e56fea784d673fce21056b4cd.zip | |
conflict with old module-init-tools
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 8a821e7fb..11cbce6af 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -433,7 +433,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 +%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 # # Then a series of requirements that are distribution specific, either @@ -1931,6 +1931,10 @@ fi # and build. %changelog +* Mon Jun 06 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc1.git0.3 +- Conflict with module-init-tools older than 3.13 to ensure the + 3.0 transition is handled correctly. + * Wed Jun 01 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc1.git0.2 - Fix utsname for 3.0-rc1 |