# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1456346528 -7200
# Node ID 0b07c031c9dbadfebec732ed0c7a8035c2cb32ce
# Parent  1e67754f6cdd22094ed3286f61893dedc38af09e
slitaz-i18n: remove files common to glibc-base from locale-* packages
glibc-extra-samba: 100% common to glibc-base; to remove?

diff -r 1e67754f6cdd -r 0b07c031c9db glibc-extra-samba/receipt
--- a/glibc-extra-samba/receipt	Wed Feb 24 17:34:26 2016 +0100
+++ b/glibc-extra-samba/receipt	Wed Feb 24 22:42:08 2016 +0200
@@ -5,16 +5,19 @@
 CATEGORY="base-system"
 SHORT_DESC="GNU libc extra gconv modules for samba."
 WEB_SITE="http://gcc.gnu.org/"
-WANTED="glibc"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 
+DEPENDS="glibc-base"
+WANTED="glibc"
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 #
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/gconv
-	for i in IBM850.so IBM437.so; do
-		cp $install/usr/lib/gconv/$i $fs/usr/lib/gconv/$i
-	done
+	# already in glibc-base - remove package?
+	#for i in IBM850.so IBM437.so; do
+	#	cp $install/usr/lib/gconv/$i $fs/usr/lib/gconv/$i
+	#done
 }
diff -r 1e67754f6cdd -r 0b07c031c9db slitaz-i18n/stuff/locale-pack.functions
--- a/slitaz-i18n/stuff/locale-pack.functions	Wed Feb 24 17:34:26 2016 +0100
+++ b/slitaz-i18n/stuff/locale-pack.functions	Wed Feb 24 22:42:08 2016 +0200
@@ -53,9 +53,16 @@
 	# Get locale definition files
 	usil='usr/share/i18n/locales'
 	for def in $locales; do
-		echo "* Copying $def locale files"
-		mkdir -p $fs/$usil
-		cp -a $WOK/glibc/install/$usil/$def $fs/$usil
+		case def in
+			en_US|en_GB)
+				# already in glibc-base
+				;;
+			*)
+				echo "* Copying $def locale files"
+				mkdir -p $fs/$usil
+				cp -a $WOK/glibc/install/$usil/$def $fs/$usil
+				;;
+		esac
 	done
 
 	if [ -n "$LOCALE_DEPENDS" ]; then
@@ -108,8 +115,15 @@
 	if [ -n "$GCONV" ]; then
 		mkdir -p $fs/usr/lib/gconv
 		for enc in $GCONV; do
-			echo "* Copying $enc gconv module"
-			cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv
+			case enc in
+				ISO8859-1|ISO8859-15)
+					# already in glibc-base
+					;;
+				*)
+					echo "* Copying $enc gconv module"
+					cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv
+					;;
+			esac
 		done
 		#ldd $fs/usr/lib/gconv/*	# test depends in gconv modules
 	fi