diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-12-02 09:34:46 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-12-02 09:34:46 -0500 |
| commit | b66345bb323f0b9eda5aa0e9fde559e5686f0fad (patch) | |
| tree | d0c4a68d8f77ff15e24cf247cdd7e573340f2ca8 | |
| parent | 115248e310b743072651f38de2790d54786bf58d (diff) | |
| download | kernel-b66345bb323f0b9eda5aa0e9fde559e5686f0fad.tar.gz kernel-b66345bb323f0b9eda5aa0e9fde559e5686f0fad.tar.xz kernel-b66345bb323f0b9eda5aa0e9fde559e5686f0fad.zip | |
Adjust Requires for modules-extra pacakge to rely on kernel-uname-r
The variant kernels (e.g. PAE) Provide kernel-%{_target_cpu}, which doesn't
include the variant name so we wind up with broken deps on the modules-extra
subpackage. kernel-uname-r incorporates the variant value at the end (e.g.
kernel-uname-r = 3.2.0-0.rc4.git0.2.fc17.i686.PAE)
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 4900519b3..5c54b458d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -907,7 +907,7 @@ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release} Provides: kernel-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:.%{1}}\ Provides: kernel-modules-extra = %{version}-%{release}%{?1:.%{1}}\ Provides: kernel-modules-extra-uname-r = %{KVERREL}%{?1:.%{1}}\ -Requires: kernel%{?1:-%{1}}-%{_target_cpu} = %{version}-%{release}%{?1:.%{1}}\ +Requires: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\ AutoReqProv: no\ %description -n kernel%{?variant}%{?1:-%{1}}-modules-extra\ This package provides less commonly used kernel modules for the %{?2:%{2} }kernel package.\ @@ -2171,6 +2171,9 @@ fi # ||----w | # || || %changelog +* Fri Dec 02 2011 Josh Boyer <jwboyer@redhat.com> +- Adjust Requires for modules-extra pacakge to rely on kernel-uname-r + * Thu Dec 01 2011 Dave Jones <davej@redhat.com> - Linux 3.2-rc4 |