- Disable pango by default in non-indic locales per upstream request. Users

can export MOZ_ENABLE_PANGO=1 to force pango support.

thunderbird.sh.in

@@ -25,6 +25,17 @@ MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird -remote"
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+# For now, in order to ship with firefox trademarks, we need to default to
+# disable pango on non-indic locales.  Use MOZ_ENABLE_PANGO=1 to force pango.
+tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
+if ! echo $tmplang | grep "^..[_-]IN" > /dev/null; then
+   if [ -z "$MOZ_ENABLE_PANGO" ]; then
+     MOZ_DISABLE_PANGO=1
+     export MOZ_DISABLE_PANGO
+   fi
+fi
+
+
 function check_running() {
     $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
     RETURN_VAL=$?

thunderbird.spec

@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5
-Release:	3
+Release:	4
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -213,6 +213,10 @@ update-desktop-database %{_datadir}/applications
 #===============================================================================
 
 %changelog
+* Fri Mar 10 2006 Christopher Aillon <caillon@redhat.com> - 1.5-4
+- Disable pango by default in non-indic locales per upstream request.
+  Users can export MOZ_ENABLE_PANGO=1 to force pango support.
+
 * Fri Feb 10 2006 Christopher Aillon <caillon@redhat.com> - 1.5-3
 - Add dumpstack.patch
 - Improve the langpack install stuff