From 17ec7bc2085ca2d88c7e54cdbf2bdda2a030b045 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 4 Oct 2009 19:08:00 +0200 Subject: [PATCH] glibc-devel: remove conflicting /usr/include/scsi/scsi.h. The same header is installed by kernel-libc-headers and seems to be the required one for packages using it. Bump revision. --HG-- extra : convert_revision : fb371fb4d28ac44515849cd57bed15667bc92fd9 --- templates/glibc/devel.template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/glibc/devel.template b/templates/glibc/devel.template index 9c7ba227336..d93cbc97682 100644 --- a/templates/glibc/devel.template +++ b/templates/glibc/devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development: headers, static libs, etc." +revision=1 + Add_dependency run glibc do_install() @@ -14,4 +16,7 @@ do_install() mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/*crt1.o ${DESTDIR}/usr/lib + + # Remove scsi.h, it's installed by kernel-libc-headers. + rm -f ${DESTDIR}/usr/include/scsi/scsi.h }