# HG changeset patch # User Christophe Lincoln # Date 1240772811 -7200 # Node ID ab6f0fde903d9d2d8330fb88c25b3f46f76a5bc0 # Parent 58d6e1a5e0ce872ea5f5f2e3caac40ec12af30c0 glibc: Remove duplicate glibc-extra-samba files in glibc-locale diff -r 58d6e1a5e0ce -r ab6f0fde903d glibc-dev/receipt --- a/glibc-dev/receipt Sun Apr 26 15:40:30 2009 +0000 +++ b/glibc-dev/receipt Sun Apr 26 21:06:51 2009 +0200 @@ -8,7 +8,6 @@ DEPENDS="glibc-base bash" WANTED="glibc" WEB_SITE="http://www.gnu.org/software/libc/" -SOURCES="glibc" # Rules to gen a SliTaz package suitable for Tazpkg. # diff -r 58d6e1a5e0ce -r ab6f0fde903d glibc-locale/receipt --- a/glibc-locale/receipt Sun Apr 26 15:40:30 2009 +0000 +++ b/glibc-locale/receipt Sun Apr 26 21:06:51 2009 +0200 @@ -5,10 +5,9 @@ CATEGORY="system-tools" SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)." MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base" +DEPENDS="glibc-base glibc-extra-samba glibc-locale-utf8" WANTED="glibc" WEB_SITE="http://www.gnu.org/software/libc/" -SOURCES="glibc" LOCALE_PACK="de cs es fr ru id it pt_BR hu" @@ -34,6 +33,14 @@ rm -f ${fs}$file done status + + # Rm glibc-extra-samba files. + echo -n "Removing all base files..." + for file in `cat $WOK/glibc-extra-samba/taz/glibc-extra-samba-$VERSION/files.list` + do + rm -f ${fs}$file + done + status # Rm files provided by locale-pack. for i in $LOCALE_PACK diff -r 58d6e1a5e0ce -r ab6f0fde903d glibc/receipt --- a/glibc/receipt Sun Apr 26 15:40:30 2009 +0000 +++ b/glibc/receipt Sun Apr 26 21:06:51 2009 +0200 @@ -41,11 +41,11 @@ { LOCALE="" mkdir -p $fs/var - for i in base locale dev + for i in base extra-samba locale dev do tazwok genpkg glibc-$i done echo "" - echo "--> Install glibc-base and cook busybox" + echo "--> Install glibc-base, glibc-dev and cook busybox" echo "" }