# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1207750000 -7200
# Node ID c066c4f6872f0851ae0be50eef060a511a6afa55
# Parent  880f45097250597f970da30e04b4d5124a150c31
Up: glibc (2.7)

diff -r 880f45097250 -r c066c4f6872f glibc-base/receipt
--- a/glibc-base/receipt	Wed Apr 09 16:05:11 2008 +0200
+++ b/glibc-base/receipt	Wed Apr 09 16:06:40 2008 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-base"
-VERSION="2.3.6"
+VERSION="2.7"
 CATEGORY="base-system"
 SHORT_DESC="GNU libc minimal libraries for SliTaz based system."
 WANTED="glibc"
@@ -26,6 +26,19 @@
     do
     	cp -a ${_pkg}$file ${fs}$file
     done
-    # Locale archive. Just a silly copy (idea ?).
-    cp stuff/locale-archive $fs/usr/lib/locale
+    
+    # Gen locale files
+	mkdir -p $fs/usr/lib/locale
+	localedef -i fr_CH -c -f ISO-8859-1 $fs/usr/lib/locale/fr_CH
+    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.
+post_install()
+{
+	local root
+	root=$1
+	ldconfig
+	rm -f $root/lib/*2.3.6.so
+	rm -f $root/usr/lib/locale/locale-archive
+}
diff -r 880f45097250 -r c066c4f6872f glibc-base/stuff/locale-archive
Binary file glibc-base/stuff/locale-archive has changed
diff -r 880f45097250 -r c066c4f6872f glibc-base/stuff/wanted-files.list
--- a/glibc-base/stuff/wanted-files.list	Wed Apr 09 16:05:11 2008 +0200
+++ b/glibc-base/stuff/wanted-files.list	Wed Apr 09 16:06:40 2008 +0200
@@ -1,17 +1,17 @@
-/lib/libutil-2.3.6.so
-/lib/libnss_dns-2.3.6.so
-/lib/libnsl-2.3.6.so
-/lib/libanl-2.3.6.so
-/lib/libm-2.3.6.so
-/lib/libpthread-2.3.6.so
-/lib/libnss_compat-2.3.6.so
-/lib/libc-2.3.6.so
-/lib/librt-2.3.6.so
-/lib/libcrypt-2.3.6.so
-/lib/ld-2.3.6.so
-/lib/libresolv-2.3.6.so
-/lib/libnss_files-2.3.6.so
-/lib/libdl-2.3.6.so
+/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
 
 /usr/lib/gconv/UNICODE.so
 /usr/lib/gconv/gconv-modules
@@ -218,7 +218,6 @@
 
 /usr/share/i18n/locales/translit_compat
 /usr/share/i18n/locales/translit_circle
-/usr/share/i18n/locales/de_CH
 /usr/share/i18n/locales/translit_small
 /usr/share/i18n/locales/fr_CH
 /usr/share/i18n/locales/i18n
diff -r 880f45097250 -r c066c4f6872f glibc-dev/receipt
--- a/glibc-dev/receipt	Wed Apr 09 16:05:11 2008 +0200
+++ b/glibc-dev/receipt	Wed Apr 09 16:06:40 2008 +0200
@@ -1,11 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-dev"
-VERSION="2.3.6"
+VERSION="2.7"
 CATEGORY="development"
 SHORT_DESC="The GNU C libraries devel files (Part of SliTaz toolchain)."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="glibc-base"
+DEPENDS="glibc-base bash"
 WANTED="glibc"
 WEB_SITE="http://www.gnu.org/software/libc/"
 SOURCES="glibc"
@@ -16,15 +16,26 @@
 #
 genpkg_rules()
 {
-    # Copy all and then remove all files specified in stuff/base-files.list.
-    # We get the files from glibc-base package.
+    # Mass copy and then remove all files specified in stuff/base-files.list.
+    # We get the files from glibc-base. Locale files are in: glibc-locale.
     cp -a $_pkg/* $fs
+    
+    # Rm base files.
     echo -n "Removing all base files..."
-    for file in `cat stuff/base-files.list`
+    for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list`
     do
     	rm -f ${fs}$file
     done
     rm -rf $fs/etc
-    rm -rf $fs/usr/share/info
+    rm -rf $fs/usr/share
+    status
+    
+    # Rm locale.
+    echo -n "Removing all locale files..."
+    for file in `cat $WOK/glibc-locale/taz/glibc-locale-$VERSION/files.list`
+    do
+    	rm -f ${fs}$file
+    done
+    rm -rf $fs/usr/lib/gconv
     status
 }
diff -r 880f45097250 -r c066c4f6872f glibc-dev/stuff/base-files.list
--- a/glibc-dev/stuff/base-files.list	Wed Apr 09 16:05:11 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,268 +0,0 @@
-/etc/ld.so.conf
-/etc/rpc
-/etc/ld.so.cache
-/lib/libpthread-2.3.6.so
-/lib/libutil-2.3.6.so
-/lib/libnss_dns-2.3.6.so
-/lib/libnss_compat-2.3.6.so
-/lib/ld-2.3.6.so
-/lib/libcrypt-2.3.6.so
-/lib/libanl-2.3.6.so
-/lib/libc-2.3.6.so
-/lib/libdl-2.3.6.so
-/lib/libresolv-2.3.6.so
-/lib/librt-2.3.6.so
-/lib/libnss_files-2.3.6.so
-/lib/libnsl-2.3.6.so
-/lib/libm-2.3.6.so
-/usr/bin/locale
-/usr/lib/locale/locale-archive
-/usr/lib/gconv/ANSI_X3.110.so
-/usr/lib/gconv/gconv-modules
-/usr/lib/gconv/ISO8859-15.so
-/usr/lib/gconv/ISO8859-1.so
-/usr/lib/gconv/ISO8859-2.so
-/usr/lib/gconv/UNICODE.so
-/usr/share/locale/locale.alias
-/usr/share/locale/fr/LC_MESSAGES/libc.mo
-/usr/share/zoneinfo/UTC
-/usr/share/zoneinfo/America/Rosario
-/usr/share/zoneinfo/America/Port-au-Prince
-/usr/share/zoneinfo/America/Eirunepe
-/usr/share/zoneinfo/America/Denver
-/usr/share/zoneinfo/America/Virgin
-/usr/share/zoneinfo/America/Edmonton
-/usr/share/zoneinfo/America/Rankin_Inlet
-/usr/share/zoneinfo/America/Indianapolis
-/usr/share/zoneinfo/America/Chihuahua
-/usr/share/zoneinfo/America/Coral_Harbour
-/usr/share/zoneinfo/America/Guayaquil
-/usr/share/zoneinfo/America/Cayman
-/usr/share/zoneinfo/America/Anguilla
-/usr/share/zoneinfo/America/Dominica
-/usr/share/zoneinfo/America/Cayenne
-/usr/share/zoneinfo/America/St_Vincent
-/usr/share/zoneinfo/America/Santo_Domingo
-/usr/share/zoneinfo/America/Indiana/Indianapolis
-/usr/share/zoneinfo/America/Indiana/Marengo
-/usr/share/zoneinfo/America/Indiana/Vevay
-/usr/share/zoneinfo/America/Indiana/Knox
-/usr/share/zoneinfo/America/St_Lucia
-/usr/share/zoneinfo/America/Tijuana
-/usr/share/zoneinfo/America/Iqaluit
-/usr/share/zoneinfo/America/Cancun
-/usr/share/zoneinfo/America/Cordoba
-/usr/share/zoneinfo/America/Dawson_Creek
-/usr/share/zoneinfo/America/Barbados
-/usr/share/zoneinfo/America/La_Paz
-/usr/share/zoneinfo/America/Thule
-/usr/share/zoneinfo/America/Porto_Velho
-/usr/share/zoneinfo/America/Goose_Bay
-/usr/share/zoneinfo/America/Scoresbysund
-/usr/share/zoneinfo/America/Araguaina
-/usr/share/zoneinfo/America/Knox_IN
-/usr/share/zoneinfo/America/Kentucky/Louisville
-/usr/share/zoneinfo/America/Kentucky/Monticello
-/usr/share/zoneinfo/America/Jujuy
-/usr/share/zoneinfo/America/Atka
-/usr/share/zoneinfo/America/Jamaica
-/usr/share/zoneinfo/America/Antigua
-/usr/share/zoneinfo/America/Noronha
-/usr/share/zoneinfo/America/Havana
-/usr/share/zoneinfo/America/Mendoza
-/usr/share/zoneinfo/America/Adak
-/usr/share/zoneinfo/America/Winnipeg
-/usr/share/zoneinfo/America/Belem
-/usr/share/zoneinfo/America/Argentina/Cordoba
-/usr/share/zoneinfo/America/Argentina/Tucuman
-/usr/share/zoneinfo/America/Argentina/Jujuy
-/usr/share/zoneinfo/America/Argentina/Mendoza
-/usr/share/zoneinfo/America/Argentina/ComodRivadavia
-/usr/share/zoneinfo/America/Argentina/Buenos_Aires
-/usr/share/zoneinfo/America/Argentina/San_Juan
-/usr/share/zoneinfo/America/Argentina/Catamarca
-/usr/share/zoneinfo/America/Argentina/La_Rioja
-/usr/share/zoneinfo/America/Argentina/Rio_Gallegos
-/usr/share/zoneinfo/America/Argentina/Ushuaia
-/usr/share/zoneinfo/America/Guyana
-/usr/share/zoneinfo/America/Boise
-/usr/share/zoneinfo/America/North_Dakota/Center
-/usr/share/zoneinfo/America/Ensenada
-/usr/share/zoneinfo/America/Godthab
-/usr/share/zoneinfo/America/Thunder_Bay
-/usr/share/zoneinfo/America/Anchorage
-/usr/share/zoneinfo/America/Buenos_Aires
-/usr/share/zoneinfo/America/Lima
-/usr/share/zoneinfo/America/Guatemala
-/usr/share/zoneinfo/America/Danmarkshavn
-/usr/share/zoneinfo/America/Shiprock
-/usr/share/zoneinfo/America/Tortola
-/usr/share/zoneinfo/America/Pangnirtung
-/usr/share/zoneinfo/America/Recife
-/usr/share/zoneinfo/America/Hermosillo
-/usr/share/zoneinfo/America/Halifax
-/usr/share/zoneinfo/America/Yellowknife
-/usr/share/zoneinfo/America/Managua
-/usr/share/zoneinfo/America/Rainy_River
-/usr/share/zoneinfo/America/Tegucigalpa
-/usr/share/zoneinfo/America/Toronto
-/usr/share/zoneinfo/America/Juneau
-/usr/share/zoneinfo/America/El_Salvador
-/usr/share/zoneinfo/America/Fort_Wayne
-/usr/share/zoneinfo/America/Grenada
-/usr/share/zoneinfo/America/Nipigon
-/usr/share/zoneinfo/America/Chicago
-/usr/share/zoneinfo/America/Costa_Rica
-/usr/share/zoneinfo/America/Aruba
-/usr/share/zoneinfo/America/Santiago
-/usr/share/zoneinfo/America/Vancouver
-/usr/share/zoneinfo/America/Port_of_Spain
-/usr/share/zoneinfo/America/Boa_Vista
-/usr/share/zoneinfo/America/Rio_Branco
-/usr/share/zoneinfo/America/Porto_Acre
-/usr/share/zoneinfo/America/New_York
-/usr/share/zoneinfo/America/Regina
-/usr/share/zoneinfo/America/Yakutat
-/usr/share/zoneinfo/America/Monterrey
-/usr/share/zoneinfo/America/Menominee
-/usr/share/zoneinfo/America/Nome
-/usr/share/zoneinfo/America/Detroit
-/usr/share/zoneinfo/America/Nassau
-/usr/share/zoneinfo/America/Catamarca
-/usr/share/zoneinfo/America/Inuvik
-/usr/share/zoneinfo/America/Puerto_Rico
-/usr/share/zoneinfo/America/Mazatlan
-/usr/share/zoneinfo/America/Caracas
-/usr/share/zoneinfo/America/Paramaribo
-/usr/share/zoneinfo/America/Martinique
-/usr/share/zoneinfo/America/Asuncion
-/usr/share/zoneinfo/America/Miquelon
-/usr/share/zoneinfo/America/Whitehorse
-/usr/share/zoneinfo/America/Montevideo
-/usr/share/zoneinfo/America/Grand_Turk
-/usr/share/zoneinfo/America/Montreal
-/usr/share/zoneinfo/America/St_Thomas
-/usr/share/zoneinfo/America/Swift_Current
-/usr/share/zoneinfo/America/Louisville
-/usr/share/zoneinfo/America/Phoenix
-/usr/share/zoneinfo/America/Bogota
-/usr/share/zoneinfo/America/Manaus
-/usr/share/zoneinfo/America/Merida
-/usr/share/zoneinfo/America/Sao_Paulo
-/usr/share/zoneinfo/America/Maceio
-/usr/share/zoneinfo/America/Bahia
-/usr/share/zoneinfo/America/St_Kitts
-/usr/share/zoneinfo/America/Mexico_City
-/usr/share/zoneinfo/America/Fortaleza
-/usr/share/zoneinfo/America/Cuiaba
-/usr/share/zoneinfo/America/Campo_Grande
-/usr/share/zoneinfo/America/Belize
-/usr/share/zoneinfo/America/Guadeloupe
-/usr/share/zoneinfo/America/Cambridge_Bay
-/usr/share/zoneinfo/America/Los_Angeles
-/usr/share/zoneinfo/America/Glace_Bay
-/usr/share/zoneinfo/America/Montserrat
-/usr/share/zoneinfo/America/Dawson
-/usr/share/zoneinfo/America/Curacao
-/usr/share/zoneinfo/America/Panama
-/usr/share/zoneinfo/America/St_Johns
-/usr/share/zoneinfo/Europe/Zagreb
-/usr/share/zoneinfo/Europe/Copenhagen
-/usr/share/zoneinfo/Europe/Ljubljana
-/usr/share/zoneinfo/Europe/Prague
-/usr/share/zoneinfo/Europe/Chisinau
-/usr/share/zoneinfo/Europe/Sarajevo
-/usr/share/zoneinfo/Europe/Dublin
-/usr/share/zoneinfo/Europe/Sofia
-/usr/share/zoneinfo/Europe/Brussels
-/usr/share/zoneinfo/Europe/Vaduz
-/usr/share/zoneinfo/Europe/Bucharest
-/usr/share/zoneinfo/Europe/Gibraltar
-/usr/share/zoneinfo/Europe/Stockholm
-/usr/share/zoneinfo/Europe/London
-/usr/share/zoneinfo/Europe/Vienna
-/usr/share/zoneinfo/Europe/Mariehamn
-/usr/share/zoneinfo/Europe/Uzhgorod
-/usr/share/zoneinfo/Europe/Moscow
-/usr/share/zoneinfo/Europe/San_Marino
-/usr/share/zoneinfo/Europe/Skopje
-/usr/share/zoneinfo/Europe/Kaliningrad
-/usr/share/zoneinfo/Europe/Bratislava
-/usr/share/zoneinfo/Europe/Nicosia
-/usr/share/zoneinfo/Europe/Simferopol
-/usr/share/zoneinfo/Europe/Tiraspol
-/usr/share/zoneinfo/Europe/Luxembourg
-/usr/share/zoneinfo/Europe/Belgrade
-/usr/share/zoneinfo/Europe/Lisbon
-/usr/share/zoneinfo/Europe/Kiev
-/usr/share/zoneinfo/Europe/Warsaw
-/usr/share/zoneinfo/Europe/Tallinn
-/usr/share/zoneinfo/Europe/Amsterdam
-/usr/share/zoneinfo/Europe/Tirane
-/usr/share/zoneinfo/Europe/Samara
-/usr/share/zoneinfo/Europe/Vatican
-/usr/share/zoneinfo/Europe/Minsk
-/usr/share/zoneinfo/Europe/Berlin
-/usr/share/zoneinfo/Europe/Andorra
-/usr/share/zoneinfo/Europe/Rome
-/usr/share/zoneinfo/Europe/Paris
-/usr/share/zoneinfo/Europe/Madrid
-/usr/share/zoneinfo/Europe/Belfast
-/usr/share/zoneinfo/Europe/Monaco
-/usr/share/zoneinfo/Europe/Helsinki
-/usr/share/zoneinfo/Europe/Malta
-/usr/share/zoneinfo/Europe/Athens
-/usr/share/zoneinfo/Europe/Oslo
-/usr/share/zoneinfo/Europe/Istanbul
-/usr/share/zoneinfo/Europe/Vilnius
-/usr/share/zoneinfo/Europe/Zaporozhye
-/usr/share/zoneinfo/Europe/Zurich
-/usr/share/zoneinfo/Europe/Riga
-/usr/share/zoneinfo/Europe/Budapest
-/usr/share/zoneinfo/CET
-/usr/share/i18n/locales/fr_FR
-/usr/share/i18n/locales/translit_font
-/usr/share/i18n/locales/translit_hangul
-/usr/share/i18n/locales/translit_fraction
-/usr/share/i18n/locales/translit_circle
-/usr/share/i18n/locales/translit_neutral
-/usr/share/i18n/locales/iso14651_t1
-/usr/share/i18n/locales/translit_small
-/usr/share/i18n/locales/fr_CH
-/usr/share/i18n/locales/translit_combining
-/usr/share/i18n/locales/translit_narrow
-/usr/share/i18n/locales/i18n
-/usr/share/i18n/locales/translit_wide
-/usr/share/i18n/locales/translit_cjk_compat
-/usr/share/i18n/locales/translit_compat
-/usr/share/i18n/locales/de_CH
-/usr/share/i18n/charmaps/ISO-8859-1.gz
-/usr/share/i18n/charmaps/ANSI_X3.110-1983.gz
-/usr/share/i18n/charmaps/ISO-8859-15.gz
-/usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
-/usr/share/i18n/charmaps/ISO-8859-2.gz
-/lib/libutil.so.1
-/lib/libnss_files.so.2
-/lib/libresolv.so.2
-/lib/ld-linux.so.2
-/lib/libcrypt.so.1
-/lib/libnsl.so.1
-/lib/libpthread.so.0
-/lib/libm.so.6
-/lib/libdl.so.2
-/lib/libnss_dns.so.2
-/lib/libanl.so.1
-/lib/libc.so.6
-/lib/libnss_compat.so.2
-/lib/librt.so.1
-/usr/lib/libcrypt.so
-/usr/lib/libanl.so
-/usr/lib/libnsl.so
-/usr/lib/libutil.so
-/usr/lib/libnss_files.so
-/usr/lib/libnss_dns.so
-/usr/lib/libdl.so
-/usr/lib/libnss_compat.so
-/usr/lib/libm.so
-/usr/lib/librt.so
-/usr/lib/libresolv.so
diff -r 880f45097250 -r c066c4f6872f glibc-dev/stuff/mkdir.list
--- a/glibc-dev/stuff/mkdir.list	Wed Apr 09 16:05:11 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/lib
-/sbin
-/usr/bin
-/usr/sbin
-/usr/lib
-/usr/include
diff -r 880f45097250 -r c066c4f6872f glibc/receipt
--- a/glibc/receipt	Wed Apr 09 16:05:11 2008 +0200
+++ b/glibc/receipt	Wed Apr 09 16:06:40 2008 +0200
@@ -1,20 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc"
-VERSION="2.3.6"
+VERSION="2.7"
 CATEGORY="development"
 SHORT_DESC="The GNU C libraries. This package is used to compile the libc."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="glibc-base glibc-dev"
+DEPENDS="glibc-base glibc-locale glibc-dev"
 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.
+#
+# Build order: glibc, glibc-base, glibc-locale, glibc-dev.
+#
 compile_rules()
 {
 	mkdir glibc-build
 	cd glibc-build
+	echo "CFLAGS += -march=i486" > configparms
 	../$PACKAGE-$VERSION/configure --prefix=/usr \
 	--infodir=/usr/share/info --disable-profile \
 	--enable-add-ons --enable-kernel=2.6.0 \