--- a/ChangeLog Fri Jul 10 07:53:33 2009 +0000
+++ b/ChangeLog Fri Jul 10 12:04:00 2009 +0000
@@ -1,3 +1,8 @@
+2009-07-10 praveen Handigol <[email protected]>
+
+ * base-specs/thunderbird.spec:
+ * patches/thunderbird-22-mailfolder.diff: Removed as this has already been upstreamed.
+
2009-07-10 Krishnan Parthasarathi <[email protected]>
Fix for CR 6853405, bump firefox to version 3.5 to address security holes.
Patches Modified
--- a/base-specs/thunderbird.spec Fri Jul 10 07:53:33 2009 +0000
+++ b/base-specs/thunderbird.spec Fri Jul 10 12:04:00 2009 +0000
@@ -11,8 +11,8 @@
Name: thunderbird
Summary: Mozilla Thunderbird Standalone E-mail and Newsgroup Client
-Version: 2.0.0.21
-%define tarball_version 2.0.0.21
+Version: 2.0.0.22
+%define tarball_version 2.0.0.22
Release: 1
Copyright: MPL/LGPL
Group: Applications/Internet
@@ -97,10 +97,6 @@
Patch16: thunderbird-21-ksh.diff
%endif
-# owner:rickju date:2008-11-26 type:bug state: upstream
-# bugzilla: 249754
-Patch17: thunderbird-22-mailfolder.diff
-
#owner:hawklu date:2008-11-27 type:bug bugster:677345 state:upstream
Patch18: thunderbird-23-expand-tree-folder.diff
@@ -190,7 +186,6 @@
%if %option_with_indiana_branding
%patch16 -p1
%endif
-%patch17 -p1
%patch18 -p1
#####################################
@@ -273,14 +268,6 @@
# $RPM_BUILD_ROOT%{_tbdir}/thunderbird-rebuild-databases
#/bin/chmod 755 $RPM_BUILD_ROOT%{_tbdir}/thunderbird-rebuild-databases
-# remove the empty directories
-# cpu/sparcv8plus/libnspr_flt4.so is not packaged
-# since we use system bundled version of nss/nspr
-%ifarch sparc
-rmdir $RPM_BUILD_ROOT%{_tbdir}/cpu/sparcv8plus
-rmdir $RPM_BUILD_ROOT%{_tbdir}/cpu
-%endif
-
# create symbol link libnssckbi.so -> /usr/lib/mps/libnssckbi.so
# to fix bug CR#6459752
ln -s ../mps/libnssckbi.so $RPM_BUILD_ROOT%{_tbdir}/libnssckbi.so
@@ -324,6 +311,9 @@
%{_datadir}/pixmaps/%{name}-icon.png
%changelog
+* Fri Jul 10 2009 - [email protected]
+- CR 6853860 Upgrade Thunderbird to 2.0.0.22 in OpenSolaris 200906
+- Removing patch thunderbird-22-mailfolder.diff as it has been upstreamed.
* Fri Mar 20 2009 - [email protected]
- Bump to 2.0.0.21
* Mon Mar 09 2009 - [email protected]
--- a/patches/thunderbird-22-mailfolder.diff Fri Jul 10 07:53:33 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp
---- a/mailnews/base/src/nsMsgFolderCompactor.cpp
-+++ b/mailnews/base/src/nsMsgFolderCompactor.cpp
-@@ -327,17 +327,23 @@ NS_IMETHODIMP nsFolderCompactState::OnSt
- {
- m_parsingFolder=PR_FALSE;
- if (NS_SUCCEEDED(status))
- status=Compact(m_folder, m_compactingOfflineFolders, m_window);
- else if (m_compactAll)
- CompactNextFolder();
- }
- else if (m_compactAll) // this should be the imap case only
-+ {
-+ nsCOMPtr <nsIMsgFolder> prevFolder = do_QueryElementAt(m_folderArray,
-+ m_folderIndex);
-+ if (prevFolder)
-+ prevFolder->SetMsgDatabase(nsnull);
- CompactNextFolder();
-+ }
- return NS_OK;
- }
-
- nsresult nsFolderCompactState::StartCompacting()
- {
- nsresult rv = NS_OK;
- if (m_size > 0)
- {