--- a/ChangeLog	Fri Jul 07 02:27:14 2006 +0000
+++ b/ChangeLog	Fri Jul 07 03:41:38 2006 +0000
@@ -1,3 +1,16 @@
+2006-07-07  Dave Lin  <[email protected]>
+
+        * firefox.spec: enable the patch firefox-15-no-nss-nspr.diff
+	  again since it will not break the other build, add patch
+	  patches/mozilla-07-no-ldlibpath.diff to remove LD_LIBRARY_PATH
+          in the startup script
+        * patches/firefox-15-no-nss-nspr.diff: Update the patch to avoid
+	  to break other build
+	* patches/mozilla-07-no-ldlibpath.diff
+        * thunderbird.spec: Add patch patches/mozilla-07-no-ldlibpath.diff
+	  to remove LD_LIBRARY_PATH in the startup script, change build
+	  options to "disable-static, and enable-shared" per Brian Lu 
+
 2006-07-06  Laszlo Kovacs <[email protected]>
 	* Solaris/SUNWkeyring: updated version numbers
 

--- a/firefox.spec	Fri Jul 07 02:27:14 2006 +0000
+++ b/firefox.spec	Fri Jul 07 03:41:38 2006 +0000
@@ -35,6 +35,7 @@
 Patch13:     firefox-13-locale.diff
 Patch14:     firefox-14-plugins.diff
 Patch15:     firefox-15-no-nss-nspr.diff
+Patch16:     mozilla-07-no-ldlibpath.diff
 
 URL:         http://www.sun.com/software/javadesktopsystem/
 
@@ -98,8 +99,8 @@
 %patch12 -p0
 %patch13 -p1
 %patch14 -p1
-## FIXME: Disable nspr patch that is breaking other components.
-##%patch15 -p1
+%patch15 -p1
+%patch16 -p1
 
 #####################################
 ##      Package Build Section      ##
@@ -126,7 +127,6 @@
 ac_add_options --libdir=%{_libdir}
 ac_add_options --mandir=%{_mandir} 
 ac_add_options --enable-xft
-#ac_add_options --enable-crypto
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
@@ -168,9 +168,7 @@
 bzip2 -dc $BUILDDIR/dist/firefox-*.tar.bz2 | tar -xf -
 
 # Don't deliver nss, nspr header files on Solaris
-## FIXME: Disable nspr patch that is breaking other components.
-##%ifos linux
-%ifos solaris
+%ifos linux
 # copy the nss files to the right place
 mkdir $RPM_BUILD_ROOT%{_includedir}/firefox/nss/
 cd ${BUILDDIR}
@@ -215,7 +213,7 @@
 /bin/chmod 644 $RPM_BUILD_ROOT%{_ffdir}/firefox-preload.list
 
 %clean
-#/bin/rm -rf $RPM_BUILD_ROOT
+/bin/rm -rf $RPM_BUILD_ROOT
 
 #########################################
 ##  Package Post[Un] Install Section   ##
@@ -264,6 +262,9 @@
 %{_datadir}/pixmaps/%{name}-icon.png
 
 %changelog
+* Fri Jul 07 2006 - [email protected]
+- add patch mozilla-07-no-ldlibpath.diff to remove the LD_LIBRARY_PATH in
+  the startup script
 * Tue Jun 13 2006 - [email protected]
 - add patch firefox-15-no-nss-nspr.diff to let firefox use nss, nspr in 
   /usr/lib/mps required by ARC

--- a/patches/firefox-15-no-nss-nspr.diff	Fri Jul 07 02:27:14 2006 +0000
+++ b/patches/firefox-15-no-nss-nspr.diff	Fri Jul 07 03:41:38 2006 +0000
@@ -1,6 +1,6 @@
 --- firefox/toolkit/mozapps/installer/packager.mk.ori2	2006-04-27 09:29:19.904719000 +0800
 +++ firefox/toolkit/mozapps/installer/packager.mk	2006-04-28 06:33:28.590446000 +0800
-@@ -183,6 +183,15 @@
+@@ -183,6 +183,16 @@
  endif # !CROSS_COMPILE
  
  NO_PKG_FILES += \
@@ -13,6 +13,67 @@
 +        libsoftokn3.so \
 +        libssl3.so \
 +        libnssckbi.so \
++        cpu/sparcv8plus/libnspr_flt4.so \
  	core \
  	bsdecho \
  	gtscc \
+--- firefox/build/unix/mozilla-config.in.ori	2006-06-26 14:10:22.186019000 +0800
++++ firefox/build/unix/mozilla-config.in	2006-06-26 20:16:23.469407000 +0800
+@@ -20,7 +20,6 @@
+     *
+ Libraries:
+     xpcom
+-    nspr
+     js
+     jsj
+     gfx
+@@ -74,7 +73,7 @@
+     --idlflags)
+       echo_idlflags=yes
+       ;;
+-    xpcom|js|nspr|gfx|jsj)
++    xpcom|js|gfx|jsj)
+       echo_components="$echo_components $1"
+       echo_libraries="$echo_libraries $1"
+       ;;
+@@ -103,19 +102,17 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-    nspr_cflags="%FULL_NSPR_CFLAGS%"
+     for n in $echo_components; do
+ 	component_includes="$component_includes -I%includedir%/$n"
+     done
+-    echo $component_includes $includes $nspr_cflags
++    echo $component_includes $includes
+ fi
+ 
+ if test "$echo_idlflags" = "yes"; then
+     echo "-I%idldir%"
+ fi
+ 
+-_nspr_libs="%FULL_NSPR_LIBS%"
+-_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
++_xpcom_libs="-lxpcom -lxpcom_core"
+ _js_libs="-ljs"
+ 
+ if test "$echo_libs" = "yes"; then
+@@ -127,9 +124,6 @@
+ 	xpcom)
+ 	    libs="$libs $_xpcom_libs"
+ 	    ;;
+-	nspr)
+-	    libs="$libs $_nspr_libs"
+-	    ;;
+ 	js)
+ 	    libs="$libs $_js_libs"
+ 	    ;;
+--- firefox/build/unix/mozilla-xpcom.pc.in.ori	2006-06-26 20:18:23.662416000 +0800
++++ firefox/build/unix/mozilla-xpcom.pc.in	2006-06-26 20:24:22.166426000 +0800
+@@ -7,6 +7,5 @@
+ Name: XPCOM
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+-Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${libdir} -lxpcom -lxpcom_core
+ Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mozilla-07-no-ldlibpath.diff	Fri Jul 07 03:41:38 2006 +0000
@@ -0,0 +1,43 @@
+--- thunderbird/build/unix/run-mozilla.sh.ori	2006-07-07 11:07:14.750490000 +0800
++++ thunderbird/build/unix/run-mozilla.sh	2006-07-07 11:14:25.418853000 +0800
+@@ -328,18 +328,18 @@
+ fi
+ ##
+ ## Set LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+-if [ -n "$LD_LIBRARYN32_PATH" ]
+-then
+-	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
+-fi
+-if [ -n "$LD_LIBRARYN64_PATH" ]
+-then
+-	LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"}
+-fi
+-if [ -n "$LD_LIBRARY_PATH_64" ]; then
+-	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64+":$LD_LIBRARY_PATH_64"}
+-fi
++#LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++#if [ -n "$LD_LIBRARYN32_PATH" ]
++#then
++#	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
++#fi
++#if [ -n "$LD_LIBRARYN64_PATH" ]
++#then
++#	LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"}
++#fi
++#if [ -n "$LD_LIBRARY_PATH_64" ]; then
++#	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64+":$LD_LIBRARY_PATH_64"}
++#fi
+ #
+ #
+ ## Set SHLIB_PATH for HPUX
+@@ -413,7 +413,8 @@
+   echo "     moz_debugger=$moz_debugger"
+ fi
+ #
+-export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
++#export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
++export MOZILLA_FIVE_HOME
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+ 
+ if [ $moz_debug -eq 1 ]

--- a/thunderbird.spec	Fri Jul 07 02:27:14 2006 +0000
+++ b/thunderbird.spec	Fri Jul 07 03:41:38 2006 +0000
@@ -28,6 +28,7 @@
 Patch5:      mozilla-05-common-tar-option.diff
 Patch8:      thunderbird-08-locale.diff
 Patch9:      thunderbird-09-no-nss-nspr.diff
+Patch10:     mozilla-07-no-ldlibpath.diff
 
 URL:         http://www.sun.com/software/javadesktopsystem/
 
@@ -86,6 +87,7 @@
 %patch5 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 #####################################
 ##      Package Build Section      ##
@@ -113,8 +115,8 @@
 ac_add_options --mandir=%{_mandir}
 ac_add_options --enable-xft
 ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-static
-ac_add_options --disable-shared
+ac_add_options --disable-static
+ac_add_options --enable-shared
 ac_add_options --disable-tests
 ac_add_options --disable-freetype2
 ac_add_options --disable-auto-deps
@@ -192,6 +194,9 @@
 %{_datadir}/pixmaps/%{name}-icon.png
 
 %changelog
+* Fri Jul 07 2006 - [email protected]
+- add patch mozilla-07-no-ldlibpath.diff to remove the LD_LIBRARY_PATH in
+- change to "disable-static, enable-shared" per Brian Lu
 * Wed Jun 21 2006 - [email protected]
 - remove patch thunderbird-07-ldap-prefs.diff to fix bug CR#6344861
 * Fri Jun 02 2006 - [email protected]