From 8a29c591701be6232fb71e47869da54665cfeb86 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Wed, 18 Mar 2015 11:54:24 -0400 Subject: [PATCH] Add k-var-headers Obsoletes/Provides When doing a variant build, you want kernel-variant-headers to Obsoletes: and Provides: kernel-headers, so that it can upgrade/replace kernel-headers. Otherwise, attempting to install kernel-variant-headers leads to rpm spewing file conflicts with kernel-headers, if installed. Signed-off-by: Jarod Wilson --- kernel.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel.spec b/kernel.spec index 2ec7c1857..849a1d024 100644 --- a/kernel.spec +++ b/kernel.spec @@ -689,6 +689,10 @@ Summary: Header files for the Linux kernel for use by glibc Group: Development/System Obsoletes: glibc-kernheaders < 3.0-46 Provides: glibc-kernheaders = 3.0-46 +%if 0%{?variant} +Obsoletes: kernel-headers < %{rpmversion}-%{pkg_release} +Provides: kernel-headers = %{rpmversion}-%{pkg_release} +%endif %description headers Kernel-headers includes the C header files that specify the interface between the Linux kernel and userspace libraries and programs. The