[kernel] conflict with old module-init-tools
Kyle McMartin
kyle at fedoraproject.org
Wed Jun 8 05:10:42 UTC 2011
commit 930327525a416c9e56fea784d673fce21056b4cd
Author: Kyle McMartin <kyle at redhat.com>
Date: Mon Jun 6 16:20:39 2011 -0400
conflict with old module-init-tools
kernel.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 8a821e7..11cbce6 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 at 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 at redhat.com> 3.0-0.rc1.git0.2
- Fix utsname for 3.0-rc1
More information about the scm-commits
mailing list