From ad5d7a58f7c3fe7daf03bf022600ef8f6654cf1584300443cbcede6de2371ac9 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 13 Oct 2015 16:18:13 +0000 Subject: [PATCH] Accepting request 338506 from home:k0da:branches:Base:System - package back i2c-dev.h the one from i2c-tools is outdated OBS-URL: https://build.opensuse.org/request/show/338506 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=94 --- linux-glibc-devel.changes | 5 +++++ linux-glibc-devel.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index 81f1a84..8729bb9 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 13 16:03:38 UTC 2015 - dvaleev@suse.com + +- package back i2c-dev.h the one from i2c-tools is outdated + ------------------------------------------------------------------- Mon Oct 12 14:56:38 UTC 2015 - dvaleev@suse.com diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 80f3c51..e9cea63 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -99,8 +99,6 @@ rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT cp -a usr $RPM_BUILD_ROOT cp -a version.h $RPM_BUILD_ROOT/usr/include/linux/ -# Temporarily exclude i2c header files, which are provided by i2c-tools instead -rm -fv $RPM_BUILD_ROOT/usr/include/linux/i2c-dev.h # resolve file conflict with glibc for now rm -fv $RPM_BUILD_ROOT//usr/include/scsi/scsi.h # Replace the directory /usr/include/asm with a symlink.