# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1456348463 -7200
# Node ID 9b7c1ea864664152d995a767a39f9f5960c58f4d
# Parent  0b07c031c9dbadfebec732ed0c7a8035c2cb32ce
Up slitaz-boot-scripts(426), remove glibc-extra-samba

diff -r 0b07c031c9db -r 9b7c1ea86466 glibc-extra-samba/receipt
--- a/glibc-extra-samba/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="glibc-extra-samba"
-VERSION="2.14.1"
-CATEGORY="base-system"
-SHORT_DESC="GNU libc extra gconv modules for samba."
-WEB_SITE="http://gcc.gnu.org/"
-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
-	# 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 0b07c031c9db -r 9b7c1ea86466 glibc-locale/receipt
--- a/glibc-locale/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/glibc-locale/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="glibc"
 WEB_SITE="http://www.gnu.org/software/libc/"
 
-DEPENDS="glibc-base glibc-extra-samba"
+DEPENDS="glibc-base"
+WANTED="glibc"
 
 LOCALE_PACK="cs de es fr hu id it pt ru sl zh_CN zh_TW"
 
@@ -34,14 +34,6 @@
 		rm -f ${fs}$file
 	done
 	status
-	
-	# Rm glibc-extra-samba files.
-	echo -n "* Removing extra samba files..."
-	for file in `cat $WOK/glibc-extra-samba/taz/glibc-extra-samba-$VERSION/files.list`
-	do
-		rm -f ${fs}$file
-	done
-	status
 
 	# Rm files provided by locale-pack.
 	for i in $LOCALE_PACK
diff -r 0b07c031c9db -r 9b7c1ea86466 glibc/receipt
--- a/glibc/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/glibc/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="linux-api-headers autoconf bash"
 
 # Genpkg order for tazwok.
-COOK_OPT="genpkg=glibc-base:glibc-extra-samba:glib-locale:glibc-dev"
-	
+COOK_OPT="genpkg=glibc-base:glib-locale:glibc-dev"
+
 # Rules to compile & install the temporary toolchain.
 cook_tmp_toolchain()
 {
diff -r 0b07c031c9db -r 9b7c1ea86466 samba-pam/receipt
--- a/samba-pam/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/samba-pam/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -17,7 +17,8 @@
 BUGS="Open directory needs MIT kerberos support (krb5)"
 
 BUILD_DEPENDS="libldap openldap openldap-dev cups cups-dev pam pam-dev krb5"
-DEPENDS="libldap samba-common glibc-extra-samba ncursesw popt zlib cifs-utils acl pam perl cups krb5"
+DEPENDS="libldap samba-common glibc-base ncursesw popt zlib cifs-utils acl pam \
+perl cups krb5"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 0b07c031c9db -r 9b7c1ea86466 samba/receipt
--- a/samba/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/samba/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -14,9 +14,10 @@
 CONFIG_FILES="/etc/samba"
 BUGS="Open directory needs MIT kerberos support (krb5)"
 
-BUILD_DEPENDS="openldap openldap-dev libcomerr-dev cups-dev talloc-dev pkg-config libldap krb5"
-DEPENDS="libldap samba-common glibc-extra-samba ncursesw popt zlib cifs-utils 
-acl krb5 cups"
+BUILD_DEPENDS="openldap openldap-dev libcomerr-dev cups-dev talloc-dev \
+pkg-config libldap krb5"
+DEPENDS="libldap samba-common glibc-base ncursesw popt zlib cifs-utils acl \
+krb5 cups"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 0b07c031c9db -r 9b7c1ea86466 slitaz-boot-scripts/receipt
--- a/slitaz-boot-scripts/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/slitaz-boot-scripts/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-boot-scripts"
-VERSION="425"
+VERSION="426"
 CATEGORY="base-system"
 SHORT_DESC="Provide all the initialisation scripts used at boot time."
 MAINTAINER="pankso@slitaz.org"
diff -r 0b07c031c9db -r 9b7c1ea86466 slitaz-toolchain/receipt
--- a/slitaz-toolchain/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/slitaz-toolchain/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -49,7 +49,7 @@
 	cook linux-api-headers --install
 	
 	# 4. glibc
-	for i in glibc glibc-base glibc-extra-samba glibc-locale glibc-dev
+	for i in glibc glibc-base glibc-locale glibc-dev
 	do
 		echo "cook: $i: $(date '+%Y-%m-%d %H:%M')" >> $tmplog
 		cook $i --install
diff -r 0b07c031c9db -r 9b7c1ea86466 smbclient/receipt
--- a/smbclient/receipt	Wed Feb 24 22:42:08 2016 +0200
+++ b/smbclient/receipt	Wed Feb 24 23:14:23 2016 +0200
@@ -7,10 +7,10 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://samba.org/"
-WANTED="samba"
 
 DEPENDS="libldap libssl cyrus-sasl readline ncurses popt libcap \
-libcomerr3 libkrb5 attr samba-common glibc-extra-samba"
+libcomerr3 libkrb5 attr samba-common glibc-base"
+WANTED="samba"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -25,4 +25,3 @@
 	mkdir -p $fs/usr/lib/cups/backend
 	ln -sf /usr/bin/smbspool $fs/usr/lib/cups/backend/smb
 }
-