- Add a notice to the about dialog denoting this is a pango enabled build.

- Tweak the user agent denoting this is a pango enabled build.

2 files changed, 19 insertions, 20 deletions

diff --git a/firefox.sh.in b/firefox.sh.in
index 3bda263..51213d3 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -83,22 +83,17 @@ FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
 export FONTCONFIG_PATH
 
 ##
-## Set MOZ_ENABLE_PANGO=1  to force enabling pango
-## Set MOZ_DISABLE_PANGO=1 to force disabling of pango
+## In order to better support certain scripts (such as Indic and some CJK 
+## scripts), Fedora builds its Firefox, with permission from the Mozilla 
+## Corporation, with the Pango system as its text renderer.  This change 
+## is known to break rendering of MathML, and may negatively impact 
+## performance on some pages.  To disable the use of Pango, set 
+## MOZ_DISABLE_PANGO=1 in your environment before launching Firefox.
 ##
-#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
-
+#
+# MOZ_DISABLE_PANGO=1
+# export MOZ_DISABLE_PANGO
+#
 
 function check_running() {
     $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'ping()' 2>/dev/null >/dev/null
diff --git a/firefox.spec b/firefox.spec
index b656a39..e1101bc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        8
+Release:        9
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -57,6 +57,8 @@ Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
 Patch100:       firefox-1.5-pango-typo.patch
+Patch101:       firefox-1.5-pango-ua.patch
+Patch102:       firefox-1.5-pango-about.patch
 
 # ---------------------------------------------------
 
@@ -119,7 +121,9 @@ compliance, performance and portability.
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p0
+%patch100 -p0 -b .pango-typo
+%patch101 -p0 -b .pango-ua
+%patch102 -p0 -b .pango-about
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -265,9 +269,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Fri Mar 10 2006 Christopher Aillon <caillon@redhat.com> - 1.5.0.1-8
-- Disable pango by default in non-indic locales per upstream request.
-  Users can export MOZ_ENABLE_PANGO=1 to force pango support.
+* Sat Mar 11 2006 Christopher Aillon <caillon@redhat.com> - 1.5.0.1-9
+- Add a notice to the about dialog denoting this is a pango enabled build.
+- Tweak the user agent denoting this is a pango enabled build.
 
 * Mon Mar  6 2006 Warren Togami <wtogami@redhat.com> - 1.5.0.1-7
 - make links point to the correct release