--- a/ChangeLog	Thu Jul 17 03:06:57 2008 +0000
+++ b/ChangeLog	Thu Jul 17 03:30:26 2008 +0000
@@ -1,3 +1,8 @@
+2008-07-17  Dave Lin <[email protected]>
+
+	* SUNWfirefoxe3.spec: Removed the unnecessary dependency
+	  SUNWsolaris-devel-docs(CR6700877), SUNWfirefox.
+
 2008-07-15  Christian Kelly <[email protected]>
 
 	* SUNWgnome-gvfs: Add dependencies on SUNWgnome-config-devel,
@@ -68,6 +73,7 @@
         * patches/firefox3-11-getting-started-bookmark.diff: new 
 	  patch needed when building with --with-indina-branding 
 
+>>>>>>> .r14587
 2008-07-02  Takao Fujiwara  <[email protected]>
 
 	* copyright/SUNWgnome-l10nmessages-*.copyright: Updated to

--- a/SUNWfirefox3.spec	Thu Jul 17 03:06:57 2008 +0000
+++ b/SUNWfirefox3.spec	Thu Jul 17 03:30:26 2008 +0000
@@ -57,7 +57,6 @@
 Requires: SUNWlibms
 Requires: SUNWtls
 Requires: SUNWlibmsr
-Requires: SUNWfirefox
 BuildRequires: SUNWzip
 BuildRequires: SUNWgtar
 BuildRequires: SUNWgnome-config-devel
@@ -66,9 +65,6 @@
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-base-libs-devel
 Requires: SUNWpostrun
-%if %option_with_sun_branding
-Requires: SUNWsolaris-devel-docs
-%endif
 %if %option_with_indiana_branding
 Requires: SUNWgetting-started-guide
 %endif
@@ -225,6 +221,8 @@
 
 
 %changelog
+* Thu Jul 17 2008 - [email protected]
+- removed the unnecessary dependency SUNWsolaris-devel-docs(CR6700877), SUNWfirefox
 * Thu May 22 2008 - [email protected]
 - change to build pkg only if "--with-ff3" is specified, otherwisze build nothing
 - change to build as "SUNWfirefox" and as default browser