--- a/ChangeLog Thu Feb 10 00:51:34 2011 +0000
+++ b/ChangeLog Fri Feb 11 10:06:34 2011 +0000
@@ -1,3 +1,10 @@
+2011-02-11 Parthasarathy Selvaraj <[email protected]>
+
+ * base-specs/firefox.spec: Bump to 3.6.12
+ * base-specs/sqlite.spec: Bump to 3.7.3
+ * patches/firefox3-08-system-nss-nspr.diff: Reduce NSS/NSPR
+ requirements to use the system NSS/NSPR. #6997419
+
2011-02-10 Dave Lin <[email protected]>
* specs/SUNWgnome-themes.spec: Removed the useless dependency.
--- a/base-specs/firefox.spec Thu Feb 10 00:51:34 2011 +0000
+++ b/base-specs/firefox.spec Fri Feb 11 10:06:34 2011 +0000
@@ -13,8 +13,8 @@
Name: firefox
Summary: Mozilla Firefox Web browser
-Version: 3.6.10
-%define tarball_version 3.6.10
+Version: 3.6.12
+%define tarball_version 3.6.12
Release: 1
Copyright: MPL
License: MPL
@@ -69,7 +69,7 @@
Patch7: firefox3-07-fix-mimetype-for-helper-app.diff
%if %option_without_moz_nss_nspr
-# owner:ginnchen date:2009-05-21 type:branding
+# owner:partha date:2010-12-21 type:branding
Patch8: firefox3-08-system-nss-nspr.diff
%endif
@@ -392,6 +392,8 @@
/bin/rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 21 2010 - [email protected]
+- Bump to Firefox 3.6.12. CR #6997419.
* Mon Aug 02 2010 - [email protected]
- Bump to Firefox 3.6.8.
* Mon Jul 05 2010 - [email protected]
--- a/base-specs/sqlite.spec Thu Feb 10 00:51:34 2011 +0000
+++ b/base-specs/sqlite.spec Fri Feb 11 10:06:34 2011 +0000
@@ -8,12 +8,12 @@
#
%define OSR 12578:1.0.2
-%define doc_version 3_6_23
+%define doc_version 3_7_3
Name: sqlite
License: public domain
Group: System/Libraries
-Version: 3.6.23
+Version: 3.7.3
Release: 1
Distribution: Java Desktop System
Vendor: www.sqlite.org
@@ -126,6 +126,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Tue Dec 21 2010 - [email protected]
+- Bump to 3.7.3. Required for thunderbird/firefox. CR #6997419.
* Mon Nov 08 2010 - [email protected]
- Roll back to 3.6.23
* Thu Oct 28 2010 - [email protected]
--- a/patches/firefox3-08-system-nss-nspr.diff Thu Feb 10 00:51:34 2011 +0000
+++ b/patches/firefox3-08-system-nss-nspr.diff Fri Feb 11 10:06:34 2011 +0000
@@ -95,3 +95,23 @@
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDOMEventTarget.h"
#include "nsGenericHTMLElement.h"
+--- a/configure 2010-10-12 14:59:35.057706758 +0800
++++ b/configure 2010-10-12 15:07:35.140487013 +0800
+@@ -12852,7 +12852,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nspr_version=4.8.6
++ min_nspr_version=4.8.4
+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
+ echo "configure:12858: checking for NSPR - version >= $min_nspr_version" >&5
+
+@@ -13139,7 +13139,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.12.8
++ min_nss_version=3.12.6
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:13145: checking for NSS - version >= $min_nss_version" >&5
+