SliTaz Repositories

     1.1 --- a/glibc-extra-samba/receipt	Wed Feb 24 17:34:26 2016 +0100
     1.2 +++ b/glibc-extra-samba/receipt	Wed Feb 24 22:42:08 2016 +0200
     1.3 @@ -5,16 +5,19 @@
     1.4  CATEGORY="base-system"
     1.5  SHORT_DESC="GNU libc extra gconv modules for samba."
     1.6  WEB_SITE="http://gcc.gnu.org/"
     1.7 -WANTED="glibc"
     1.8  MAINTAINER="pascal.bellard@slitaz.org"
     1.9  LICENSE="GPL2"
    1.10  
    1.11 +DEPENDS="glibc-base"
    1.12 +WANTED="glibc"
    1.13 +
    1.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.15  #
    1.16  genpkg_rules()
    1.17  {
    1.18  	mkdir -p $fs/usr/lib/gconv
    1.19 -	for i in IBM850.so IBM437.so; do
    1.20 -		cp $install/usr/lib/gconv/$i $fs/usr/lib/gconv/$i
    1.21 -	done
    1.22 +	# already in glibc-base - remove package?
    1.23 +	#for i in IBM850.so IBM437.so; do
    1.24 +	#	cp $install/usr/lib/gconv/$i $fs/usr/lib/gconv/$i
    1.25 +	#done
    1.26  }

     2.1 --- a/slitaz-i18n/stuff/locale-pack.functions	Wed Feb 24 17:34:26 2016 +0100
     2.2 +++ b/slitaz-i18n/stuff/locale-pack.functions	Wed Feb 24 22:42:08 2016 +0200
     2.3 @@ -53,9 +53,16 @@
     2.4  	# Get locale definition files
     2.5  	usil='usr/share/i18n/locales'
     2.6  	for def in $locales; do
     2.7 -		echo "* Copying $def locale files"
     2.8 -		mkdir -p $fs/$usil
     2.9 -		cp -a $WOK/glibc/install/$usil/$def $fs/$usil
    2.10 +		case def in
    2.11 +			en_US|en_GB)
    2.12 +				# already in glibc-base
    2.13 +				;;
    2.14 +			*)
    2.15 +				echo "* Copying $def locale files"
    2.16 +				mkdir -p $fs/$usil
    2.17 +				cp -a $WOK/glibc/install/$usil/$def $fs/$usil
    2.18 +				;;
    2.19 +		esac
    2.20  	done
    2.21  
    2.22  	if [ -n "$LOCALE_DEPENDS" ]; then
    2.23 @@ -108,8 +115,15 @@
    2.24  	if [ -n "$GCONV" ]; then
    2.25  		mkdir -p $fs/usr/lib/gconv
    2.26  		for enc in $GCONV; do
    2.27 -			echo "* Copying $enc gconv module"
    2.28 -			cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv
    2.29 +			case enc in
    2.30 +				ISO8859-1|ISO8859-15)
    2.31 +					# already in glibc-base
    2.32 +					;;
    2.33 +				*)
    2.34 +					echo "* Copying $enc gconv module"
    2.35 +					cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv
    2.36 +					;;
    2.37 +			esac
    2.38  		done
    2.39  		#ldd $fs/usr/lib/gconv/*	# test depends in gconv modules
    2.40  	fi