diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-20 08:13:48 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-20 08:13:48 -0400 |
| commit | 0ad3713581707dc6d4d25ab7d148a37b654cff48 (patch) | |
| tree | ef85a4fc962a97739da2aee14a164180cc775178 /kernel.spec | |
| parent | 7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9 (diff) | |
| download | kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.tar.gz kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.tar.xz kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.zip | |
3.1-rc2-git7 snapshot. Fix provides/obsoletes for cpupowerutils-devel
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 4d4ed2645..8a29ad2f8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 5 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -678,7 +678,6 @@ Patch800: linux-2.6-crash-driver.patch # virt + ksm patches Patch1555: fix_xen_guest_on_old_EC2.patch -Patch1556: xen-blkfront-name-adjust.patch # DRM @@ -823,6 +822,8 @@ Summary: Assortment of tools for the Linux kernel Group: Development/System License: GPLv2 Requires: kernel-tools = %{version}-%{release} +Provides: cpupowerutils-devel = 1:009-0.6.p1 +Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 %description -n kernel-tools-devel This package contains the development files for the tools/ directory from the kernel source. @@ -1311,7 +1312,6 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch # Assorted Virt Fixes ApplyPatch fix_xen_guest_on_old_EC2.patch -ApplyPatch xen-blkfront-name-adjust.patch # DRM core @@ -2074,6 +2074,10 @@ fi # ||----w | # || || %changelog +* Sat Aug 20 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.1-rc2-git7 +- Add a provides/obsoletes for cpupowerutils-devel + * Fri Aug 19 2011 Josh Boyer <jwboyer@redhat.com> - Add patch from upstream to fix 64-bit divide error in btrfs |