packages: asterisk-sounds-core/asterisk-sounds-core.spec - libmagic utf-8 b...

[jajcus]

Author: jajcus                       Date: Tue Jan 12 12:06:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libmagic utf-8 bug workaround improved

---- Files affected:
packages/asterisk-sounds-core:
   asterisk-sounds-core.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/asterisk-sounds-core/asterisk-sounds-core.spec
diff -u packages/asterisk-sounds-core/asterisk-sounds-core.spec:1.2 packages/asterisk-sounds-core/asterisk-sounds-core.spec:1.3
--- packages/asterisk-sounds-core/asterisk-sounds-core.spec:1.2	Wed Dec 30 11:57:55 2009
+++ packages/asterisk-sounds-core/asterisk-sounds-core.spec	Tue Jan 12 13:06:46 2010
@@ -369,8 +369,9 @@
 
 if [ -f /proc/$PPID/environ ]; then
 	# import env from parent process
+	unset LC_ALL
 	export $(tr '\0' '\n' < /proc/$PPID/environ | grep -E '^(LC_|LANG)')
-	if locale | grep -qi utf8; then
+	if locale | grep -Eqi 'utf-?8'; then
 		echo >&2 "You should re-run rpmbuild with LANG=C LC_ALL=C, see https://bugs.launchpad.net/pld-linux/+bug/501593"
 		exit 1
 	fi
@@ -561,6 +562,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/01/12 12:06:46  jajcus
+- libmagic utf-8 bug workaround improved
+
 Revision 1.2  2009/12/30 10:57:55  glen
 - builds in non-utf8 locale; rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk-sounds-core/asterisk-sounds-core.spec?r1=1.2&r2=1.3&f=u