# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1306885807 -7200
# Node ID d630cec004835ee079639919753299feb7d1bf09
# Parent  8adbcdae8a95d00562539271f9282157c71d3dfe
Improve existing locale pack and locale-pt only for Portuguese/Portugal

diff -r 8adbcdae8a95 -r d630cec00483 locale-cs/receipt
--- a/locale-cs/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-cs/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -25,6 +25,9 @@
 	get_core_messages
 	PACKAGE="$PKG_NAME"
 	VERSION="$PKG_VERS"
+	# Pregenerate locale file so we dont need glibc-locale as dep.
+	mkdir -p $fs/usr/lib/locale
+	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
 }
 
 # Back to C if it's the last used locale.
@@ -34,4 +37,5 @@
 		echo "LANG=C" > /etc/locale.conf
 		echo "LC_ALL=C" >> /etc/locale.conf
 	fi
+	rm -rf /usr/lib/locale/$LOCALEDEF
 }
diff -r 8adbcdae8a95 -r d630cec00483 locale-fr-extra/receipt
--- a/locale-fr-extra/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-fr-extra/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -6,7 +6,6 @@
 SHORT_DESC="Extra French locale pack (with Gimp, Mplayer, Xine)"
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://www.slitaz.org/"
-
 DEPENDS="locale-fr"
 BUILD_DEPENDS="slitaz-i18n-extra"
 
diff -r 8adbcdae8a95 -r d630cec00483 locale-hu/receipt
--- a/locale-hu/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-hu/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -25,6 +25,9 @@
 	get_core_messages
 	PACKAGE="$PKG_NAME"
 	VERSION="$PKG_VERS"
+	# Pregenerate locale file so we dont need glibc-locale as dep.
+	mkdir -p $fs/usr/lib/locale
+	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
 }
 
 # Back to C if it's the last used locale.
@@ -34,4 +37,5 @@
 		echo "LANG=C" > /etc/locale.conf
 		echo "LC_ALL=C" >> /etc/locale.conf
 	fi
+	rm -rf /usr/lib/locale/$LOCALEDEF
 }
diff -r 8adbcdae8a95 -r d630cec00483 locale-id/receipt
--- a/locale-id/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-id/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -25,6 +25,9 @@
 	get_core_messages
 	PACKAGE="$PKG_NAME"
 	VERSION="$PKG_VERS"
+	# Pregenerate locale file so we dont need glibc-locale as dep.
+	mkdir -p $fs/usr/lib/locale
+	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
 }
 
 # Back to C if it's the last used locale.
@@ -34,4 +37,5 @@
 		echo "LANG=C" > /etc/locale.conf
 		echo "LC_ALL=C" >> /etc/locale.conf
 	fi
+	rm -rf /usr/lib/locale/$LOCALEDEF
 }
diff -r 8adbcdae8a95 -r d630cec00483 locale-pt/receipt
--- a/locale-pt/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-pt/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -3,14 +3,14 @@
 PACKAGE="locale-pt"
 VERSION="4.0"
 CATEGORY="system-tools"
-SHORT_DESC="Portuguese/Brazilian locale pack."
+SHORT_DESC="Portuguese locale pack."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="glibc-base"
 BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
 WEB_SITE="http://www.slitaz.org/"
 
 LOCALE="pt"
-LOCALEDEF="pt_BR"
+LOCALEDEF="pt_PT"
 CHARMAP="UTF-8"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -25,15 +25,9 @@
 	get_core_messages
 	PACKAGE="$PKG_NAME"
 	VERSION="$PKG_VERS"
-	LOCALE="pt_BR"
-}
-
-# Post install to remove old locale-pt_BR.
-post_install()
-{
-	if [ -d /var/lib/tazpkg/installed/locale-pt_BR ]; then
-		echo "y" | tazpkg remove locale-pt_BR
-	fi
+	# Pregenerate locale file so we dont need glibc-locale as dep.
+	mkdir -p $fs/usr/lib/locale
+	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
 }
 
 # Back to C if it's the last used locale.
@@ -43,4 +37,5 @@
 		echo "LANG=C" > /etc/locale.conf
 		echo "LC_ALL=C" >> /etc/locale.conf
 	fi
+	rm -rf /usr/lib/locale/$LOCALEDEF
 }
diff -r 8adbcdae8a95 -r d630cec00483 locale-pt_BR/receipt
--- a/locale-pt_BR/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-pt_BR/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -3,13 +3,25 @@
 PACKAGE="locale-pt_BR"
 VERSION="1.2"
 CATEGORY="meta"
-SHORT_DESC="Old Brazilian locale pack - Moved to locale-pt."
+SHORT_DESC="Portuguese/Brazilian locale pack."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="locale-pt"
 WEB_SITE="http://www.slitaz.org/"
 
-# We just need a dir to pack
+LOCALE="pt_BR"
+LOCALEDEF="pt_BR"
+CHARMAP="UTF-8"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	PKG_NAME="$PACKAGE"
+	PKG_VERS="$VERSION"
+	mk_locale_dir
+	get_slitaz_messages
+	get_core_messages
+	PACKAGE="$PKG_NAME"
+	VERSION="$PKG_VERS"
 }
diff -r 8adbcdae8a95 -r d630cec00483 locale-sv/receipt
--- a/locale-sv/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-sv/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -10,6 +10,8 @@
 WEB_SITE="http://www.slitaz.org/"
 
 LOCALE="sv"
+LOCALEDEF="sv_SE"
+CHARMAP="UTF-8"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -23,6 +25,9 @@
 	get_core_messages
 	PACKAGE="$PKG_NAME"
 	VERSION="$PKG_VERS"
+	# Pregenerate locale file so we dont need glibc-locale as dep.
+	mkdir -p $fs/usr/lib/locale
+	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
 }
 
 # Back to C if it's the last used locale.
@@ -32,4 +37,5 @@
 		echo "LANG=C" > /etc/locale.conf
 		echo "LC_ALL=C" >> /etc/locale.conf
 	fi
+	rm -rf /usr/lib/locale/$LOCALEDEF
 }
diff -r 8adbcdae8a95 -r d630cec00483 locale-zh_TW/receipt
--- a/locale-zh_TW/receipt	Wed Jun 01 00:26:48 2011 +0200
+++ b/locale-zh_TW/receipt	Wed Jun 01 01:50:07 2011 +0200
@@ -26,7 +26,7 @@
 	get_core_messages
 	PACKAGE="$PKG_NAME"
 	VERSION="$PKG_VERS"
-	# Pregenerate locale file si we dont need glibc-locale as dep.
+	# Pregenerate locale file so we dont need glibc-locale as dep.
 	mkdir -p $fs/usr/lib/locale
 	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
 }
@@ -38,4 +38,5 @@
 		echo "LANG=C" > /etc/locale.conf
 		echo "LC_ALL=C" >> /etc/locale.conf
 	fi
+	rm -rf /usr/lib/locale/$LOCALEDEF
 }