SliTaz Repositories

     1.1 --- a/locale-zh_CN/receipt	Sun Jun 02 12:09:39 2013 +0000
     1.2 +++ b/locale-zh_CN/receipt	Sat Sep 14 17:06:00 2013 +0000
     1.3 @@ -1,50 +1,35 @@
     1.4  # SliTaz package receipt
     1.5  
     1.6  PACKAGE="locale-zh_CN"
     1.7 -VERSION="4.0"
     1.8 +VERSION="4.1"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Chinese Simplified locale pack."
    1.11  MAINTAINER="lufeng369@slitaz.org"
    1.12  WEB_SITE="http://www.slitaz.org/"
    1.13  
    1.14 -WANTED="slitaz-i18n xorg-libX11"
    1.15 +WANTED="glibc slitaz-i18n xorg-libX11"
    1.16  DEPENDS="glibc-base wqy-microhei"
    1.17 -BUILD_DEPENDS="glibc-locale xorg-libX11 slitaz-i18n"
    1.18  
    1.19  LOCALE="zh_CN"
    1.20 -LOCALEDEF="zh_CN"
    1.21 -CHARMAP="UTF-8"
    1.22  
    1.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.24 -# Genereted locale files are in /usr/lib/locale.
    1.25  genpkg_rules()
    1.26  {
    1.27  	. $WOK/slitaz-i18n/stuff/locale-pack.functions
    1.28  	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    1.29 -
    1.30 -	mkdir -p $fs/usr/share/locale/$LOCALE $fs/usr/lib/locale
    1.31 -	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF.UTF-8
    1.32 +	get_locale
    1.33  
    1.34  	GCONV_MODULES="
    1.35 -		BIG5.so             GBBIG5.so   GBGBK.so
    1.36 -		UTF-32.so           GB18030.so	EUC-CN.so
    1.37 -		GBK.so              UTF-7.so	libGB.so"
    1.38 +		BIG5.so    GBBIG5.so   GBGBK.so
    1.39 +		UTF-32.so  GB18030.so  EUC-CN.so
    1.40 +		GBK.so     UTF-7.so    libGB.so"
    1.41  	mkdir -p $fs/usr/bin
    1.42  	mkdir -p $fs/usr/lib/gconv
    1.43  
    1.44  	cp /usr/bin/iconv $fs/usr/bin
    1.45  	for i in $GCONV_MODULES; do
    1.46 -		cp /usr/lib/gconv/$i $fs/usr/lib/gconv
    1.47 +		cp $WOK/glibc/install/usr/lib/gconv/$i $fs/usr/lib/gconv
    1.48  	done
    1.49 -	
    1.50 -	install  -D /usr/share/zoneinfo/Asia/Shanghai \
    1.51 -		$fs/usr/share/zoneinfo/Asia/Shanghai -m 644
    1.52 -	install  -D /usr/share/zoneinfo/posix/Asia/Shanghai \
    1.53 -		$fs/usr/share/posix/zoneinfo/Asia/Shanghai -m 644
    1.54 -	install  -D /usr/share/zoneinfo/right/Asia/Shanghai \
    1.55 -		$fs/usr/share/right/zoneinfo/Asia/Shanghai -m 644
    1.56 -
    1.57 -	get_x11_locale
    1.58  }
    1.59  
    1.60  post_install()
    1.61 @@ -60,9 +45,5 @@
    1.62  # Back to C if it's the last used locale.
    1.63  post_remove()
    1.64  {
    1.65 -	if [ -z "$1" ]; then
    1.66 -		if [ $(grep -q $LOCALEDEF /etc/locale.conf) ]; then
    1.67 -			echo "LANG=C" > /etc/locale.conf
    1.68 -		fi
    1.69 -	fi
    1.70 +	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
    1.71  }