--- a/ChangeLog	Fri May 16 13:24:39 2008 +0000
+++ b/ChangeLog	Fri May 16 15:23:42 2008 +0000
@@ -1,3 +1,17 @@
+2008-05-16  Damien Carbery <[email protected]>
+
+	* SUNWgnome-devhelp.spec, SUNWgnome-help-viewer.spec: Undo Evan's
+	  change - revert to depend on SUNWfirefox/-devel because FF3 is not
+	  stable enough to be the default browser in Nevada.
+	* base-specs/devhelp.spec: Comment out Evan's patch,
+	  01-using-firefox3-gecko, so that we build against firefox 2 because
+	  FF3 is not stable enough to be the default browser in Nevada.
+	* base-specs/yelp.spec: Disable Brian's patch, 04-using-firefox3-gecko,
+	  to build against firefox 2 because FF3 is not stable enough to be the
+	  default broswer in Nevada.
+	* SUNWfirefox3.spec: Disable creation of symlink for firefox 3. This
+	  means that ff2 is left as default browser.
+
 2008-05-16  Stephen Browne  <[email protected]>
 
 	* SUNWgnome-panel.spec: remove conditional BuildRequires

--- a/SUNWfirefox3.spec	Fri May 16 13:24:39 2008 +0000
+++ b/SUNWfirefox3.spec	Fri May 16 15:23:42 2008 +0000
@@ -152,8 +152,9 @@
   echo '/usr/bin/update-desktop-database'
 ) | $BASEDIR/lib/postrun -b -u -c JDS_wait
 
-rm -f $BASEDIR/bin/firefox
-ln -s ../lib/firefox3/firefox $BASEDIR/bin/firefox
+# Disable creation of symlink to keep firefox 2 as default browser.
+#rm -f $BASEDIR/bin/firefox
+#ln -s ../lib/firefox3/firefox $BASEDIR/bin/firefox
 
 %postun
 test -x $BASEDIR/lib/postrun || exit 0
@@ -161,8 +162,9 @@
   echo '/usr/bin/update-desktop-database'
 ) | $BASEDIR/lib/postrun -b -u -c JDS
 
-rm -f $BASEDIR/bin/firefox
-ln -s ../lib/firefox/firefox $BASEDIR/bin/firefox
+# Disable restoration of symlink as firefox 3 symlink was not created.
+#rm -f $BASEDIR/bin/firefox
+#ln -s ../lib/firefox/firefox $BASEDIR/bin/firefox
 
 %if %with_apoc_adapter
 %post apoc-adapter
@@ -217,6 +219,9 @@
 %endif
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- Disable creation of symlink for firefox 3. This means that ff2 is left as
+  default browser.
 * Thu Mar 13 2008 - [email protected]
 - Add -I/usr/X11/include to CFLAGS after update of SUNWwinc.
 * Mon Feb 25 2008 - [email protected]

--- a/SUNWgnome-devhelp.spec	Fri May 16 13:24:39 2008 +0000
+++ b/SUNWgnome-devhelp.spec	Fri May 16 15:23:42 2008 +0000
@@ -24,10 +24,10 @@
 %include default-depend.inc
 Requires:                SUNWgnome-base-libs
 Requires:                SUNWgnome-panel
-Requires:                SUNWfirefox3
+Requires:                SUNWfirefox
 BuildRequires:           SUNWgnome-base-libs-devel
 BuildRequires:           SUNWgnome-panel-devel
-BuildRequires:           SUNWfirefox3-devel
+BuildRequires:           SUNWfirefox-devel
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -142,6 +142,9 @@
 %endif
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- Undo Evan's change - revert to depend on SUNWfirefox/-devel because FF3 is
+  not stable enough to be the default browser in Nevada.
 * Thu May 08 2008 - [email protected]
 - Replace Build/Requires SUNWfirefox/-devel to SUNWfirefox3/-devel
 - Remove hardcode of firefox inlude path.

--- a/SUNWgnome-help-viewer.spec	Fri May 16 13:24:39 2008 +0000
+++ b/SUNWgnome-help-viewer.spec	Fri May 16 15:23:42 2008 +0000
@@ -29,7 +29,7 @@
 Requires:       SUNWgnome-config
 Requires:       SUNWlxml
 Requires:       SUNWlxsl
-Requires:  	SUNWfirefox3
+Requires:  	SUNWfirefox
 Requires:       SUNWbzip
 Requires:       SUNWgnome-print
 Requires:       SUNWlibC
@@ -38,7 +38,7 @@
 Requires:       SUNWpostrun
 BuildRequires:  SUNWgnome-print-devel
 BuildRequires:  SUNWlibpopt-devel
-BuildRequires:  SUNWfirefox3-devel
+BuildRequires:  SUNWfirefox-devel
 BuildRequires:  SUNWgnome-print-devel
 BuildRequires:  SUNWgnome-vfs-devel
 BuildRequires:  SUNWgnome-component-devel
@@ -161,6 +161,9 @@
 %endif
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- Undo Evan's change - revert todepend on SUNWfirefox/-devel because FF3 is not
+  stable enough to be the default browser in Nevada.
 * Thu May 15 2008 - [email protected]
 - Remove references to /usr/sfw because freetype2 is under /usr now.
 * Thu May 08 2008 - [email protected]

--- a/base-specs/devhelp.spec	Fri May 16 13:24:39 2008 +0000
+++ b/base-specs/devhelp.spec	Fri May 16 15:23:42 2008 +0000
@@ -19,7 +19,7 @@
 Source:        http://ftp.gnome.org/pub/GNOME/sources/devhelp/%{ver_major}/devhelp-%{version}.tar.bz2
 
 #date:2008-05-08 owner:evan type:bug bugzilla: 499050
-Patch1:       devhelp-01-using-firefox3-gecko.diff
+##Patch1:       devhelp-01-using-firefox3-gecko.diff
 
 URL:           http://developer.imendio.com/projects/devhelp
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
@@ -68,7 +68,7 @@
 
 %prep
 %setup -q
-%patch1 -p1
+##%patch1 -p1
 
 %build
 %ifos linux
@@ -124,6 +124,11 @@
 %{_libdir}/pkgconfig/libdevhelp-1.0.pc
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- Comment out Evan's patch, 01-using-firefox3-gecko, so that we build against
+  firefox 2 because FF3 is not stable enough to be the default browser in
+  Nevada.
+
 * Thu May 08 2008 - [email protected]
 - Add patch devhelp-01-using-firefox3-gecko.diff:
   build devhelp with firefox3 package

--- a/base-specs/yelp.spec	Fri May 16 13:24:39 2008 +0000
+++ b/base-specs/yelp.spec	Fri May 16 15:23:42 2008 +0000
@@ -26,7 +26,7 @@
 # date:2008-03-20 owner:fujiwara type:bug bugster:6656484 bugzilla:513668
 Patch3:       yelp-03-g11n-cast-iteration.diff
 # date:2008-04-20 owner:hawklu type:bug 
-Patch4:       yelp-04-using-firefox3-gecko.diff
+##Patch4:       yelp-04-using-firefox3-gecko.diff
 
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -81,7 +81,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+##%patch4 -p1
 
 %build
 %ifos linux
@@ -117,7 +117,7 @@
     --datadir=%{_datadir}       \
     --sysconfdir=%{_sysconfdir} \
     --libexecdir=%{_libexecdir} \
-    --with-gecko=firefox3 \
+    --with-gecko=firefox \
     --localstatedir=/var/lib $NO_RTTI
 make -j $CPUS
 
@@ -150,6 +150,10 @@
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- Disable Brian's patch, 04-using-firefox3-gecko, to build against firefox 2
+  because FF3 is not stable enough to be the default broswer in Nevada.
+
 * Mon Apr 21 2008 - [email protected]
 - Add patch yelp-04-using-firefox3-gecko.diff:
   build yelp with firefox3 devel package