| summaryrefslogtreecommitdiff |
| author | Michal Marek <mmarek@suse.cz> | 2009-08-03 10:00:23 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2009-08-03 10:00:23 (GMT) |
| commit | 82c71c2506dfc5f7015e4ad21632e2c25936a422 (patch) (side-by-side diff) | |
| tree | bd455889343f075da7541617b5397a038efaf4ac | |
| parent | 57464ec6f21a9571dbbe81ade06302e06586f2b7 (diff) | |
- rpm/kernel-binary.spec.in: more kmp obsoletes (bnc#526579).rpm-2.6.16.60-0.50
| -rw-r--r-- | kernel-source.changes | 5 | ||||
| -rw-r--r-- | rpm/kernel-binary.spec.in | 31 |
2 files changed, 26 insertions, 10 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index 33bc771..05de0d0 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 3 11:59:53 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: more kmp obsoletes (bnc#526579). + +------------------------------------------------------------------- Mon Aug 3 11:19:16 CEST 2009 - ptesarik@suse.cz - patches.xen/xen3-x86_64-vdso: Add __wall_to_monotonic to diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index d02f9f2..3c9d1fc 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -125,9 +125,15 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. (We add # "a" to the versions here to ignore the kernel version, which is part of # the KMP version, i.e., 7.3.15_2.6.16.21_0.8) +Obsoletes: adaptec-aacraid-kmp < 1.1.5.2459a Obsoletes: adaptec-aic94xx-kmp < 1.0.2a -Obsoletes: broadcom-bnx2-kmp < 1.5.5ba -Obsoletes: broadcom-tg3-kmp < 3.71ba +Obsoletes: atheros-atl1-kmp < 1.2.40.3a +Obsoletes: broadcom-bnx2-kmp < 2.0.1a +Obsoletes: broadcom-bnx2x-kmp < 1.48.105a +Obsoletes: broadcom-tg3-kmp < 3.99ca +Obsoletes: brocade-bfa-kmp < 2.0.0.0a +Obsoletes: brocade-bna-kmp < 2.0.0.0a +Obsoletes: dell-sata_svw-kmp < 2.0.1a Obsoletes: fsc-benet <= 1.0.748.0-2 Obsoletes: fsc-benet-kmp < 1.0.748.0_2.6.16.60_0.47 Obsoletes: fsc-e1000e <= 0.4.1.7-1 @@ -138,7 +144,7 @@ Obsoletes: fsc-ixgbe <= 1.3.31.5-1 Obsoletes: fsc-ixgbe-kmp < 1.3.31.5_2.6.16.60_0.47 Obsoletes: fsc-lpfc <= 8.1.10.3.3fsc-3 Obsoletes: fsc-megaraid <= 2.20.5.0.3fsc-1 -Obsoletes: fsc-megaraid_sas < 00.00.03.18-1 +Obsoletes: fsc-megaraid_sas-kmp < 00.00.03.23a Obsoletes: fsc-sky2-kmp < 1.10a Obsoletes: fsc-tg3-kmp < 3.77d Obsoletes: fujitsujp-e1000-kmp < 7.6.9.1a @@ -149,19 +155,24 @@ Obsoletes: fujitsujp-lpfc-kmp < 8.1.10.10FJ1.0 Obsoletes: fujitsujp-pciehp-kmp < 0.4FJ2.0.1a Obsoletes: hp-e1000-kmp < 7.6.5a Obsoletes: hp-qla2xxx-kmp < 8.01.07.25 +Obsoletes: hp-r8101-kmp < 1.009.00a +Obsoletes: hp-sky2-kmp < 1.22a Obsoletes: ibm-aacraid-kmp < 1.1.5.2449 -Obsoletes: intel-e1000-kmp < 7.6.5 +Obsoletes: intel-e1000-kmp < 7.6.15.6a +Obsoletes: intel-e1000e-kmp < 1.0.2.5a Obsoletes: intel-hda-codec-kmp < 1.0a Obsoletes: intel-i810-agpgart-kmp < 1.2 Obsoletes: intel-i810-drm < 1.2 Obsoletes: intel-iamt-heci-kmp < 3.1.0.31 -Obsoletes: intel-igb-kmp < 1.0.8 +Obsoletes: intel-igb-kmp < 1.3.19.3a Obsoletes: intel-ipw3945-kmp < 1.1.0a -Obsoletes: intel-iwlwifi-kmp < 1.2.0 -Obsoletes: intel-ixgbe-kmp < 1.1.21 +Obsoletes: intel-iwlwifi-kmp < 1.3.27a +Obsoletes: intel-ixgbe-kmp < 2.0.34.3a +Obsoletes: lpfc-kmp < 8.2.0.29a Obsoletes: lsi-megaraid_sas-kmp < 00.00.03.15 -Obsoletes: lsi-mptlinux-kmp < 4.00.13.10 -Obsoletes: novell-mac80211-kmp < 20071128 +Obsoletes: lsi-mptlinux-kmp < 4.00.43.00a +Obsoletes: novell-mac80211-kmp < 20081028a +Obsoletes: novell-sky2-kmp < 1.22a Obsoletes: primergy-benet <= 1.0.748.0-2 Obsoletes: primergy-benet-kmp < 1.0.748.0_2.6.16.60_0.47 Obsoletes: primergy-e1000e <= 0.4.1.7-1 @@ -172,7 +183,7 @@ Obsoletes: primergy-ixgbe <= 1.3.31.5-1 Obsoletes: primergy-ixgbe-kmp < 1.3.31.5_2.6.16.60_0.47 Obsoletes: qlogic-qla2xxx-kmp < 8.01.07.ks Obsoletes: qlogic-qla2xxx-kmp < 8.01.07a -Obsoletes: realtek-r8169-kmp < 8.004.00 +Obsoletes: realtek-r8169-kmp < 8.008.00a Obsoletes: sgi-fusion-kmp < 3.04.02a # Provide the exported symbols as "ksym(symbol) = hash" |