rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f15

Browse Source
This commit is contained in:
Jan Horak 2011-11-15 12:14:01 +01:00
commit 54f67ed572
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
thunderbird-8.0-enable-addons.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up comm-release/mail/app/profile/all-thunderbird.js.addons comm-release/mail/app/profile/all-thunderbird.js
--- comm-release/mail/app/profile/all-thunderbird.js.addons 2011-11-15 10:36:03.868551158 +0100
+++ comm-release/mail/app/profile/all-thunderbird.js 2011-11-15 10:36:20.555397903 +0100
@@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
// constants in AddonManager.jsm for values to use here
-pref("extensions.autoDisableScopes", 15);
+pref("extensions.autoDisableScopes", 0);
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
diff -up comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm
--- comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2011-11-15 11:15:06.518905245 +0100
+++ comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm 2011-11-15 11:15:40.399934236 +0100
@@ -1591,8 +1591,8 @@ var XPIProvider = {
this.showUpgradeUI();
flushCaches = true;
}
- else if (aAppChanged === undefined) {
- // For new profiles we will never need to show the add-on selection UI
+ else {
+ // For all profiles we will never need to show the add-on selection UI
Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
}

2
thunderbird-redhat-default-prefs.js
View File

@ -14,3 +14,5 @@ pref("mailnews.database.global.indexer.enabled", false);
# Do not switch to Smart Folders after upgrade to 3.0b4
pref("mail.folder.views.version", "1")
pref("extensions.shownSelectionUI", true);
pref("extensions.autoDisableScope", 0);

19
thunderbird.spec
View File

@ -22,19 +22,12 @@
%define enable_mozilla_crashreporter 0
%endif
%if 0%{?fedora} >= 16
# Disable mozilla crash reporter temporary for rawhide because new libcurl-devel
# does not include curl/types.h file which is required by google breakpad
# Issue has been reported to: http://code.google.com/p/google-breakpad/issues/detail?id=431
%define enable_mozilla_crashreporter 0
%endif
%define mozappdir %{_libdir}/%{name}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 8.0
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -66,6 +59,9 @@ Patch11: xulrunner-2.0-NetworkManager09.patch
# Build patches
Patch100: xulrunner-install.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
%if %{official_branding}
# Required by Mozilla Corporation
@ -149,6 +145,8 @@ cd mozilla
%patch100 -p2 -b .install
cd ..
%patch200 -p1 -b .addons
%if %{official_branding}
# Required by Mozilla Corporation
@ -352,6 +350,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Thu Nov 10 2011 Jan Horak <jhorak@redhat.com> - 8.0-2
- Enable Mozilla's crash reporter again for all archs
- Temporary workaround for langpacks
- Disabled addon check UI (#753551)
* Tue Nov 8 2011 Jan Horak <jhorak@redhat.com> - 8.0-1
- Update to 8.0