--- a/ChangeLog	Mon Apr 21 06:29:21 2008 +0000
+++ b/ChangeLog	Mon Apr 21 06:50:38 2008 +0000
@@ -1,3 +1,10 @@
+2008-04-21  Ginn Chen <[email protected]>
+
+	* patches/firefox-21-remove-hardcoded-fontname.diff:
+	  Remove hardcoded fontnames for indiana
+	* base-specs/firefox.spec:
+	  add patch /firefox-21-remove-hardcoded-fontname.diff
+
 2008-04-21  Laszlo (Laca) Peter  <[email protected]>
 
 	* patches/getting-started-guide-01-refresh-0.diff:

--- a/base-specs/firefox.spec	Mon Apr 21 06:29:21 2008 +0000
+++ b/base-specs/firefox.spec	Mon Apr 21 06:50:38 2008 +0000
@@ -116,6 +116,14 @@
 # bugster:6686579 bugzilla:285267
 Patch20: firefox-20-g11n-nav-lang.diff
 
+%if %option_with_indiana_branding
+# owner:ginnchen date:2008-04-18 type:branding
+# bugzilla:359777 defect.opensolaris.org#513
+# We don't want this patch on Solaris Nevada, because in Firefox 2
+# on Nevada the hardcoded fonts look better than the default ones
+Patch21: firefox-21-remove-hardcoded-fontname.diff
+%endif
+
 URL:         http://www.sun.com/software/javadesktopsystem/
 
 BuildRoot:   %{_tmppath}/%{name}-%{tarball_version}-build
@@ -200,6 +208,9 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%if %option_with_indiana_branding
+%patch21 -p1
+%endif
 
 #####################################
 ##      Package Build Section      ##
@@ -363,6 +374,8 @@
 %{_datadir}/pixmaps/%{name}-icon.png
 
 %changelog
+* Mon Apr 21 2008 - [email protected]
+- Add indiana branding patch: firefox-21-remove-hardcoded-fontname.diff
 * Fri Apr 18 2008 - [email protected]
 - bump to FF 2.0.0.14 to fix critical regression in 2.0.0.13
 * Wed Apr 16 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox-21-remove-hardcoded-fontname.diff	Mon Apr 21 06:50:38 2008 +0000
@@ -0,0 +1,53 @@
+--- firefox/modules/libpref/src/init/all.js.orig	2008-02-21 15:47:56.192123000 +0800
++++ firefox/modules/libpref/src/init/all.js	2008-04-18 13:52:14.956397000 +0800
+@@ -1941,33 +1941,33 @@
+ 
+ // th
+ 
+-pref("font.name.serif.tr", "Times");
+-pref("font.name.sans-serif.tr", "Helvetica");
+-pref("font.name.monospace.tr", "Courier");
++pref("font.name.serif.tr", "serif");
++pref("font.name.sans-serif.tr", "sans-serif");
++pref("font.name.monospace.tr", "monospace");
+ 
+ pref("font.name.serif.x-baltic", "serif");
+ pref("font.name.sans-serif.x-baltic", "sans-serif");
+ pref("font.name.monospace.x-baltic", "monospace");
+ 
+-pref("font.name.serif.x-central-euro", "Times");
+-pref("font.name.sans-serif.x-central-euro", "Helvetica");
+-pref("font.name.monospace.x-central-euro", "Courier");
++pref("font.name.serif.x-central-euro", "serif");
++pref("font.name.sans-serif.x-central-euro", "sans-serif");
++pref("font.name.monospace.x-central-euro", "monospace");
+ 
+ pref("font.name.serif.x-cyrillic", "serif");
+ pref("font.name.sans-serif.x-cyrillic", "sans-serif");
+ pref("font.name.monospace.x-cyrillic", "monospace");
+ 
+-pref("font.name.serif.x-unicode", "Times");
+-pref("font.name.sans-serif.x-unicode", "Helvetica");
+-pref("font.name.monospace.x-unicode", "Courier");
+-
+-pref("font.name.serif.x-user-def", "Times");
+-pref("font.name.sans-serif.x-user-def", "Helvetica");
+-pref("font.name.monospace.x-user-def", "Courier");
+-
+-pref("font.name.serif.x-western", "Times");
+-pref("font.name.sans-serif.x-western", "Helvetica");
+-pref("font.name.monospace.x-western", "Courier");
++pref("font.name.serif.x-unicode", "serif");
++pref("font.name.sans-serif.x-unicode", "sans-serif");
++pref("font.name.monospace.x-unicode", "monospace");
++
++pref("font.name.serif.x-user-def", "serif");
++pref("font.name.sans-serif.x-user-def", "sans-serif");
++pref("font.name.monospace.x-user-def", "monospace");
++
++pref("font.name.serif.x-western", "serif");
++pref("font.name.sans-serif.x-western", "sans-serif");
++pref("font.name.monospace.x-western", "monospace");
+ 
+ pref("font.name.serif.zh-CN", "serif");
+ pref("font.name.sans-serif.zh-CN", "sans-serif");