rpms/thunderbird/devel thunderbird.sh.in, 1.4, 1.5 thunderbird.spec, 1.64, 1.65

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22428

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Log Message:
* Fri Mar 10 2006 Christopher Aillon <caillon at 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.



Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thunderbird.sh.in	4 May 2005 19:43:53 -0000	1.4
+++ thunderbird.sh.in	10 Mar 2006 07:00:58 -0000	1.5
@@ -25,6 +25,17 @@
 #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=$?


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- thunderbird.spec	10 Feb 2006 22:46:52 -0000	1.64
+++ thunderbird.spec	10 Mar 2006 07:01:14 -0000	1.65
@@ -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 @@
 #===============================================================================
 
 %changelog
+* Fri Mar 10 2006 Christopher Aillon <caillon at 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 at redhat.com> - 1.5-3
 - Add dumpstack.patch
 - Improve the langpack install stuff