From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Thu, 15 Apr 2010 19:43:46 +0000 (+0000)
Subject: Fix conflicts between kernel-headers and glibc-headers that causes following error;
X-Git-Tag: linux-2.6-22-47~3
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=022013db6e4c8ffa5c32d11495e4d4f210c23c0e

Fix conflicts between kernel-headers and glibc-headers that causes following error;

Transaction Check Error:
 file /usr/include/scsi/scsi.h from install of kernel-headers-2.6.22.19-vs2.3.0.34.46.planetlab.x86_64 conflicts with file from package glibc-headers-2.5-42.el5_4.3.x86_64
 file /usr/include/scsi/scsi_ioctl.h from install of kernel-headers-2.6.22.19-vs2.3.0.34.46.planetlab.x86_64 conflicts with file from package glibc-headers-2.5-42.el5_4.3.x86_64
 file /usr/include/scsi/sg.h from install of kernel-headers-2.6.22.19-vs2.3.0.34.46.planetlab.x86_64 conflicts with file from package glibc-headers-2.5-42.el5_4.3.x86_64
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 3317bc5ce..7d8077721 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -557,6 +557,7 @@ BuildKernel() {
     make -s ARCH=$Arch INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr
     find $RPM_BUILD_ROOT/%{_includedir} -name \*.cmd -delete
     rm -f $RPM_BUILD_ROOT/%{_includedir}/{..,.}{check,install}*
+    rm -rf $RPM_BUILD_ROOT/usr/include/scsi
 %endif
 
 %if %{iwlwifi}