[kernel] add mdadm conflict

Kyle McMartin kyle at fedoraproject.org
Wed Jun 15 16:23:37 UTC 2011


commit 930d409822d3da81e089b28df7c5364efad9a306
Author: Kyle McMartin <kyle at redhat.com>
Date:   Wed Jun 15 12:23:23 2011 -0400

    add mdadm conflict

 kernel.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0fafbdc..5b64a92 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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, module-init-tools < 3.13-1, device-mapper-libs < 1.02.63-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, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5
 
 #
 # Then a series of requirements that are distribution specific, either
@@ -1930,6 +1930,9 @@ fi
 
 %changelog
 * Wed Jun 15 2011 Kyle McMartin <kmcmartin at redhat.com>
+- Conflict with pre-3.2.1-5 versions of mdadm. (#710646)
+
+* Wed Jun 15 2011 Kyle McMartin <kmcmartin at redhat.com>
 - Build in aesni-intel on i686 for symmetry with 64-bit.
 
 * Tue Jun 14 2011 Kyle McMartin <kmcmartin at redhat.com> 3.0-0.rc3.git0.3


More information about the scm-commits mailing list