wok-current rev 10778

Improve existing locale pack and locale-pt only for Portuguese/Portugal
author Christophe Lincoln <pankso@slitaz.org>
date Wed Jun 01 01:50:07 2011 +0200 (2011-06-01)
parents 8adbcdae8a95
children 275cf05e1e22
files locale-cs/receipt locale-fr-extra/receipt locale-hu/receipt locale-id/receipt locale-pt/receipt locale-pt_BR/receipt locale-sv/receipt locale-zh_TW/receipt
line diff
     1.1 --- a/locale-cs/receipt	Wed Jun 01 00:26:48 2011 +0200
     1.2 +++ b/locale-cs/receipt	Wed Jun 01 01:50:07 2011 +0200
     1.3 @@ -25,6 +25,9 @@
     1.4  	get_core_messages
     1.5  	PACKAGE="$PKG_NAME"
     1.6  	VERSION="$PKG_VERS"
     1.7 +	# Pregenerate locale file so we dont need glibc-locale as dep.
     1.8 +	mkdir -p $fs/usr/lib/locale
     1.9 +	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    1.10  }
    1.11  
    1.12  # Back to C if it's the last used locale.
    1.13 @@ -34,4 +37,5 @@
    1.14  		echo "LANG=C" > /etc/locale.conf
    1.15  		echo "LC_ALL=C" >> /etc/locale.conf
    1.16  	fi
    1.17 +	rm -rf /usr/lib/locale/$LOCALEDEF
    1.18  }
     2.1 --- a/locale-fr-extra/receipt	Wed Jun 01 00:26:48 2011 +0200
     2.2 +++ b/locale-fr-extra/receipt	Wed Jun 01 01:50:07 2011 +0200
     2.3 @@ -6,7 +6,6 @@
     2.4  SHORT_DESC="Extra French locale pack (with Gimp, Mplayer, Xine)"
     2.5  MAINTAINER="pankso@slitaz.org"
     2.6  WEB_SITE="http://www.slitaz.org/"
     2.7 -
     2.8  DEPENDS="locale-fr"
     2.9  BUILD_DEPENDS="slitaz-i18n-extra"
    2.10  
     3.1 --- a/locale-hu/receipt	Wed Jun 01 00:26:48 2011 +0200
     3.2 +++ b/locale-hu/receipt	Wed Jun 01 01:50:07 2011 +0200
     3.3 @@ -25,6 +25,9 @@
     3.4  	get_core_messages
     3.5  	PACKAGE="$PKG_NAME"
     3.6  	VERSION="$PKG_VERS"
     3.7 +	# Pregenerate locale file so we dont need glibc-locale as dep.
     3.8 +	mkdir -p $fs/usr/lib/locale
     3.9 +	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    3.10  }
    3.11  
    3.12  # Back to C if it's the last used locale.
    3.13 @@ -34,4 +37,5 @@
    3.14  		echo "LANG=C" > /etc/locale.conf
    3.15  		echo "LC_ALL=C" >> /etc/locale.conf
    3.16  	fi
    3.17 +	rm -rf /usr/lib/locale/$LOCALEDEF
    3.18  }
     4.1 --- a/locale-id/receipt	Wed Jun 01 00:26:48 2011 +0200
     4.2 +++ b/locale-id/receipt	Wed Jun 01 01:50:07 2011 +0200
     4.3 @@ -25,6 +25,9 @@
     4.4  	get_core_messages
     4.5  	PACKAGE="$PKG_NAME"
     4.6  	VERSION="$PKG_VERS"
     4.7 +	# Pregenerate locale file so we dont need glibc-locale as dep.
     4.8 +	mkdir -p $fs/usr/lib/locale
     4.9 +	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    4.10  }
    4.11  
    4.12  # Back to C if it's the last used locale.
    4.13 @@ -34,4 +37,5 @@
    4.14  		echo "LANG=C" > /etc/locale.conf
    4.15  		echo "LC_ALL=C" >> /etc/locale.conf
    4.16  	fi
    4.17 +	rm -rf /usr/lib/locale/$LOCALEDEF
    4.18  }
     5.1 --- a/locale-pt/receipt	Wed Jun 01 00:26:48 2011 +0200
     5.2 +++ b/locale-pt/receipt	Wed Jun 01 01:50:07 2011 +0200
     5.3 @@ -3,14 +3,14 @@
     5.4  PACKAGE="locale-pt"
     5.5  VERSION="4.0"
     5.6  CATEGORY="system-tools"
     5.7 -SHORT_DESC="Portuguese/Brazilian locale pack."
     5.8 +SHORT_DESC="Portuguese locale pack."
     5.9  MAINTAINER="pankso@slitaz.org"
    5.10  DEPENDS="glibc-base"
    5.11  BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
    5.12  WEB_SITE="http://www.slitaz.org/"
    5.13  
    5.14  LOCALE="pt"
    5.15 -LOCALEDEF="pt_BR"
    5.16 +LOCALEDEF="pt_PT"
    5.17  CHARMAP="UTF-8"
    5.18  
    5.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.20 @@ -25,15 +25,9 @@
    5.21  	get_core_messages
    5.22  	PACKAGE="$PKG_NAME"
    5.23  	VERSION="$PKG_VERS"
    5.24 -	LOCALE="pt_BR"
    5.25 -}
    5.26 -
    5.27 -# Post install to remove old locale-pt_BR.
    5.28 -post_install()
    5.29 -{
    5.30 -	if [ -d /var/lib/tazpkg/installed/locale-pt_BR ]; then
    5.31 -		echo "y" | tazpkg remove locale-pt_BR
    5.32 -	fi
    5.33 +	# Pregenerate locale file so we dont need glibc-locale as dep.
    5.34 +	mkdir -p $fs/usr/lib/locale
    5.35 +	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    5.36  }
    5.37  
    5.38  # Back to C if it's the last used locale.
    5.39 @@ -43,4 +37,5 @@
    5.40  		echo "LANG=C" > /etc/locale.conf
    5.41  		echo "LC_ALL=C" >> /etc/locale.conf
    5.42  	fi
    5.43 +	rm -rf /usr/lib/locale/$LOCALEDEF
    5.44  }
     6.1 --- a/locale-pt_BR/receipt	Wed Jun 01 00:26:48 2011 +0200
     6.2 +++ b/locale-pt_BR/receipt	Wed Jun 01 01:50:07 2011 +0200
     6.3 @@ -3,13 +3,25 @@
     6.4  PACKAGE="locale-pt_BR"
     6.5  VERSION="1.2"
     6.6  CATEGORY="meta"
     6.7 -SHORT_DESC="Old Brazilian locale pack - Moved to locale-pt."
     6.8 +SHORT_DESC="Portuguese/Brazilian locale pack."
     6.9  MAINTAINER="pankso@slitaz.org"
    6.10  DEPENDS="locale-pt"
    6.11  WEB_SITE="http://www.slitaz.org/"
    6.12  
    6.13 -# We just need a dir to pack
    6.14 +LOCALE="pt_BR"
    6.15 +LOCALEDEF="pt_BR"
    6.16 +CHARMAP="UTF-8"
    6.17 +
    6.18 +# Rules to gen a SliTaz package suitable for Tazpkg.
    6.19  genpkg_rules()
    6.20  {
    6.21 -	mkdir -p $fs/usr
    6.22 +	. $WOK/slitaz-i18n/stuff/locale-pack.functions
    6.23 +	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    6.24 +	PKG_NAME="$PACKAGE"
    6.25 +	PKG_VERS="$VERSION"
    6.26 +	mk_locale_dir
    6.27 +	get_slitaz_messages
    6.28 +	get_core_messages
    6.29 +	PACKAGE="$PKG_NAME"
    6.30 +	VERSION="$PKG_VERS"
    6.31  }
     7.1 --- a/locale-sv/receipt	Wed Jun 01 00:26:48 2011 +0200
     7.2 +++ b/locale-sv/receipt	Wed Jun 01 01:50:07 2011 +0200
     7.3 @@ -10,6 +10,8 @@
     7.4  WEB_SITE="http://www.slitaz.org/"
     7.5  
     7.6  LOCALE="sv"
     7.7 +LOCALEDEF="sv_SE"
     7.8 +CHARMAP="UTF-8"
     7.9  
    7.10  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.11  genpkg_rules()
    7.12 @@ -23,6 +25,9 @@
    7.13  	get_core_messages
    7.14  	PACKAGE="$PKG_NAME"
    7.15  	VERSION="$PKG_VERS"
    7.16 +	# Pregenerate locale file so we dont need glibc-locale as dep.
    7.17 +	mkdir -p $fs/usr/lib/locale
    7.18 +	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    7.19  }
    7.20  
    7.21  # Back to C if it's the last used locale.
    7.22 @@ -32,4 +37,5 @@
    7.23  		echo "LANG=C" > /etc/locale.conf
    7.24  		echo "LC_ALL=C" >> /etc/locale.conf
    7.25  	fi
    7.26 +	rm -rf /usr/lib/locale/$LOCALEDEF
    7.27  }
     8.1 --- a/locale-zh_TW/receipt	Wed Jun 01 00:26:48 2011 +0200
     8.2 +++ b/locale-zh_TW/receipt	Wed Jun 01 01:50:07 2011 +0200
     8.3 @@ -26,7 +26,7 @@
     8.4  	get_core_messages
     8.5  	PACKAGE="$PKG_NAME"
     8.6  	VERSION="$PKG_VERS"
     8.7 -	# Pregenerate locale file si we dont need glibc-locale as dep.
     8.8 +	# Pregenerate locale file so we dont need glibc-locale as dep.
     8.9  	mkdir -p $fs/usr/lib/locale
    8.10  	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    8.11  }
    8.12 @@ -38,4 +38,5 @@
    8.13  		echo "LANG=C" > /etc/locale.conf
    8.14  		echo "LC_ALL=C" >> /etc/locale.conf
    8.15  	fi
    8.16 +	rm -rf /usr/lib/locale/$LOCALEDEF
    8.17  }