--- a/ChangeLog	Tue Aug 08 20:21:25 2006 +0000
+++ b/ChangeLog	Wed Aug 09 03:24:26 2006 +0000
@@ -1,3 +1,12 @@
+2006-08-09  Dave Lin  <[email protected]>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * ext-sources/firefox-preload.list.in: Corrected the path of nss/nspr
+	  lib in the preload list
+	* firefox.spec: Bump version to 1.5.0.6 
+        * thunderbird.spec: Bump version to 1.5.0.5
+
 2006-08-02  Brian Cameron  <[email protected]>
 
 	* patches/ORBit-05-localonly.diff:  Updated patch to fix call

--- a/ext-sources/firefox-preload.list.in	Tue Aug 08 20:21:25 2006 +0000
+++ b/ext-sources/firefox-preload.list.in	Wed Aug 09 03:24:26 2006 +0000
@@ -1,3 +1,11 @@
+NSS_NSPR_DIR/libnspr4.so 
+NSS_NSPR_DIR/libplc4.so
+NSS_NSPR_DIR/libplds4.so
+NSS_NSPR_DIR/libnss3.so
+NSS_NSPR_DIR/libsmime3.so
+NSS_NSPR_DIR/libsoftokn3.so
+NSS_NSPR_DIR/libssl3.so 
+NSS_NSPR_DIR/libnssckbi.so
 FIREFOX_LIB_DIR/components/libgfx_gtk.so
 FIREFOX_LIB_DIR/components/libsearchservice.so
 FIREFOX_LIB_DIR/components/librdf.so
@@ -6,16 +14,13 @@
 FIREFOX_LIB_DIR/components/libuconv.so
 FIREFOX_LIB_DIR/components/libwidget_gtk2.so
 FIREFOX_LIB_DIR/components/libeditor.so
-FIREFOX_LIB_DIR/libsoftokn3.so
 FIREFOX_LIB_DIR/chrome/classic.jar
 FIREFOX_LIB_DIR/components/libpipnss.so
 FIREFOX_LIB_DIR/components/libhtmlpars.so
 FIREFOX_LIB_DIR/components/libi18n.so
-FIREFOX_LIB_DIR/libnspr4.so
 FIREFOX_LIB_DIR/components/libxpconnect.so
 FIREFOX_LIB_DIR/chrome/en-US.jar
 FIREFOX_LIB_DIR/components/libtoolkitcomps.so
-FIREFOX_LIB_DIR/libnss3.so
 FIREFOX_LIB_DIR/components/libdocshell.so
 FIREFOX_LIB_DIR/libmozjs.so
 FIREFOX_LIB_DIR/components/libnecko.so

--- a/firefox.spec	Tue Aug 08 20:21:25 2006 +0000
+++ b/firefox.spec	Wed Aug 09 03:24:26 2006 +0000
@@ -9,7 +9,7 @@
 Name:        firefox
 %define code_name  none
 Summary:     Mozilla Firefox Web browser
-Version:     1.5.0.4
+Version:     1.5.0.6
 %define tarball_version %{version}
 Release:     1
 Copyright:   MPL/LGPL
@@ -50,6 +50,7 @@
 
 %define _unpackaged_files_terminate_build 0
 %define _ffdir %{_libdir}/%{name}
+%define nss_nspr_dir %{_libdir}/mps
 
 #####################################
 ##  Package Requirements Section   ##
@@ -207,9 +208,14 @@
 /bin/mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
 install -c -m 644 ${BUILDDIR}/gecko.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
 
-# install preloaded library list that would be picked up by gdmprefetch 
-/bin/cat %{SOURCE6} | /usr/bin/sed -e 's,FIREFOX_LIB_DIR,%{_ffdir},g' > \
+# install preloaded library list that would be picked up by gdmprefetch
+/usr/bin/sed -e 's,NSS_NSPR_DIR,%{nss_nspr_dir},g' \
+             -e 's,FIREFOX_LIB_DIR,%{_ffdir},g' %{SOURCE6} > \
   $RPM_BUILD_ROOT%{_ffdir}/firefox-preload.list
+%ifarch sparc
+echo "%{nss_nspr_dir}/cpu/sparcv8plus/libnspr_flt4.so" >> \
+  $RPM_BUILD_ROOT%{_ffdir}/firefox-preload.list
+%endif
 /bin/chmod 644 $RPM_BUILD_ROOT%{_ffdir}/firefox-preload.list
 
 %clean
@@ -262,6 +268,9 @@
 %{_datadir}/pixmaps/%{name}-icon.png
 
 %changelog
+* Wed Aug 09 2006 - [email protected]
+- bump version to 1.5.0.6
+- correct the path of nss/nspr libs in the preload list
 * Fri Jul 07 2006 - [email protected]
 - add patch mozilla-07-no-ldlibpath.diff to remove the LD_LIBRARY_PATH in
   the startup script

--- a/thunderbird.spec	Tue Aug 08 20:21:25 2006 +0000
+++ b/thunderbird.spec	Wed Aug 09 03:24:26 2006 +0000
@@ -8,7 +8,7 @@
 
 Name:        thunderbird
 Summary:     Mozilla Thunderbird Standalone E-mail and Newsgroup Client
-Version:     1.5.0.4
+Version:     1.5.0.5
 %define tarball_version %{version}
 Release:     1
 Copyright:   MPL/LGPL
@@ -194,6 +194,8 @@
 %{_datadir}/pixmaps/%{name}-icon.png
 
 %changelog
+* Wed Aug 09 2006 - [email protected]
+- bump version to 1.5.0.5
 * 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