# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1240417366 -7200
# Node ID 4a057e1fc620669c645c3ee0826e1662dad5f95b
# Parent  1a75c11a137f08ce0ca9f93378c70b2959316db4
Up: glibc (2.9)

diff -r 1a75c11a137f -r 4a057e1fc620 glibc-base/receipt
--- a/glibc-base/receipt	Wed Apr 22 18:21:48 2009 +0200
+++ b/glibc-base/receipt	Wed Apr 22 18:22:46 2009 +0200
@@ -1,10 +1,10 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-base"
-VERSION="2.7"
+VERSION="2.9"
 CATEGORY="base-system"
 SHORT_DESC="GNU libc minimal libraries for SliTaz based system."
-WEB_SITE="http://gcc.gnu.org/"
+WEB_SITE="http://www.gnu.org/software/libc/"
 WANTED="glibc"
 MAINTAINER="pankso@slitaz.org"
 
@@ -27,19 +27,21 @@
     do
     	cp -a ${_pkg}$file ${fs}$file
     done
-    
     # Gen locale files (see also locale-pack).
-    #
 	mkdir -p $fs/usr/lib/locale
 	localedef -i fr_FR -c -f ISO-8859-1 $fs/usr/lib/locale/fr_FR
 }
 
-# Call ldconfig and remove old glibc-2.3.6 files.
+# Call ldconfig and remove old glibc-2.3.6 (slitaz 1.0) and glibc-2.7
+# files.
+pre_install()
+{
+	rm -f $1/usr/lib/locale/locale-archive
+}
+
 post_install()
 {
 	local root
-	root=$1
-	ldconfig
-	rm -f $root/lib/*2.3.6.so
-	rm -f $root/usr/lib/locale/locale-archive
+	rm -f $1/lib/*2.3.6.so
+	rm -f $1/lib/*2.7.so
 }
diff -r 1a75c11a137f -r 4a057e1fc620 glibc-base/stuff/wanted-files.list
--- a/glibc-base/stuff/wanted-files.list	Wed Apr 22 18:21:48 2009 +0200
+++ b/glibc-base/stuff/wanted-files.list	Wed Apr 22 18:22:46 2009 +0200
@@ -1,17 +1,17 @@
-/lib/libutil-2.7.so
-/lib/libnss_dns-2.7.so
-/lib/libnsl-2.7.so
-/lib/libanl-2.7.so
-/lib/libm-2.7.so
-/lib/libpthread-2.7.so
-/lib/libnss_compat-2.7.so
-/lib/libc-2.7.so
-/lib/librt-2.7.so
-/lib/libcrypt-2.7.so
-/lib/ld-2.7.so
-/lib/libresolv-2.7.so
-/lib/libnss_files-2.7.so
-/lib/libdl-2.7.so
+/lib/libutil-2.9.so
+/lib/libnss_dns-2.9.so
+/lib/libnsl-2.9.so
+/lib/libanl-2.9.so
+/lib/libm-2.9.so
+/lib/libpthread-2.9.so
+/lib/libnss_compat-2.9.so
+/lib/libc-2.9.so
+/lib/librt-2.9.so
+/lib/libcrypt-2.9.so
+/lib/ld-2.9.so
+/lib/libresolv-2.9.so
+/lib/libnss_files-2.9.so
+/lib/libdl-2.9.so
 
 /usr/lib/gconv/UNICODE.so
 /usr/lib/gconv/gconv-modules
diff -r 1a75c11a137f -r 4a057e1fc620 glibc-dev/receipt
--- a/glibc-dev/receipt	Wed Apr 22 18:21:48 2009 +0200
+++ b/glibc-dev/receipt	Wed Apr 22 18:22:46 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-dev"
-VERSION="2.7"
+VERSION="2.9"
 CATEGORY="development"
 SHORT_DESC="The GNU C libraries devel files (Part of SliTaz toolchain)."
 MAINTAINER="pankso@slitaz.org"
diff -r 1a75c11a137f -r 4a057e1fc620 glibc-extra-samba/receipt
--- a/glibc-extra-samba/receipt	Wed Apr 22 18:21:48 2009 +0200
+++ b/glibc-extra-samba/receipt	Wed Apr 22 18:22:46 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-extra-samba"
-VERSION="2.7"
+VERSION="2.9"
 CATEGORY="base-system"
 SHORT_DESC="GNU libc extra gconv modules for samba."
 WEB_SITE="http://gcc.gnu.org/"
diff -r 1a75c11a137f -r 4a057e1fc620 glibc-locale/receipt
--- a/glibc-locale/receipt	Wed Apr 22 18:21:48 2009 +0200
+++ b/glibc-locale/receipt	Wed Apr 22 18:22:46 2009 +0200
@@ -1,19 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-locale"
-VERSION="2.7"
+VERSION="2.9"
 CATEGORY="system-tools"
-SHORT_DESC="The GNU C libraries locale files (see also locale-*)."
+SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="glibc-base"
 WANTED="glibc"
 WEB_SITE="http://www.gnu.org/software/libc/"
 SOURCES="glibc"
 
+LOCALE_PACK="de cs es fr ru id it pt_BR hu"
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
-#
-# This package provide glibc locale files and utility.
-#
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share $fs/usr/lib $fs/usr/bin
@@ -37,7 +36,7 @@
 	status
 
 	# Rm files provided by locale-pack.
-	for i in de cs es fr ru id it pt_BR
+	for i in $LOCALE_PACK
 	do
 		echo -n "* Removing locale: $i"
 		rm -rf $fs/usr/share/locale/$i
diff -r 1a75c11a137f -r 4a057e1fc620 glibc/receipt
--- a/glibc/receipt	Wed Apr 22 18:21:48 2009 +0200
+++ b/glibc/receipt	Wed Apr 22 18:22:46 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc"
-VERSION="2.7"
+VERSION="2.9"
 CATEGORY="development"
 SHORT_DESC="The GNU C libraries. This package is used to compile the libc."
 MAINTAINER="pankso@slitaz.org"
@@ -10,7 +10,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/libc/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-LOCALE=""
 
 # Rules to configure and make the package.
 #
@@ -24,7 +23,7 @@
 	# to the source tree to keep $src and $_pkg for genpkg.
 	mkdir -p ../$PACKAGE-$VERSION/_pkg/etc
 	touch ../$PACKAGE-$VERSION/_pkg/etc/ld.so.conf
-	echo "CFLAGS += -march=i486" > configparms
+	echo "CFLAGS += -march=i486 -mtune=native" > configparms
 	../$PACKAGE-$VERSION/configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -38,14 +37,15 @@
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
-#
-# Just a dir for the meta-package.
-#
 genpkg_rules()
 {
+	LOCALE=""
 	mkdir -p $fs/var
 	for i in base locale dev
 	do
 		tazwok genpkg glibc-$i
 	done
+	echo ""
+	echo "--> Install glibc-base and cook busybox"
+	echo ""
 }