From 8f2483a2103eb2015d6e220c9468e4a77dab06db83c2441ec4e036baf25fec71 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 28 Jan 2015 15:19:36 +0000 Subject: [PATCH] Accepting request 283167 from home:michal-m:branches:Base:System issue a warning when a process uses this socket option. - Only removing /usr/include/scsi/scsi.h (bnc#834498) OBS-URL: https://build.opensuse.org/request/show/283167 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=84 --- linux-glibc-devel.changes | 7 ++++++- linux-glibc-devel.spec | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index ba894e4..265101c 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -23,7 +23,12 @@ Tue Mar 4 16:14:59 UTC 2014 - mmarek@suse.cz - Update to kernel headers 3.13. - Drop the never-upstreamed SO_BSDCOMPAT patch. The kernel does - issue a warning when a process uses this socked option. + issue a warning when a process uses this socket option. + +------------------------------------------------------------------- +Fri Jan 24 06:39:31 UTC 2014 - jjolly@suse.com + +- Only removing /usr/include/scsi/scsi.h (bnc#834498) ------------------------------------------------------------------- Wed Oct 9 11:36:05 UTC 2013 - schwab@suse.de diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 3f4f1c1..d05305e 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -1,7 +1,7 @@ # # spec file for package linux-glibc-devel # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -102,7 +102,7 @@ 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* +rm -fv $RPM_BUILD_ROOT//usr/include/scsi/scsi.h # Replace the directory /usr/include/asm with a symlink. # libc contained a symlink /usr/include/asm into kernel-source up to 7.0 (2.1.3) # glibc-devel contained a symlink /usr/include/asm into kernel-source in 7.1 (2.2)