Removed firefox-disable-checkupdates.patch and disabled updater

This commit is contained in:
Jan Horak 2010-11-12 16:42:39 +01:00
parent a9a8d1eed9
commit a57d8cbbe9
3 changed files with 1 additions and 14 deletions

View File

@ -1,12 +0,0 @@
diff -up mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates mozilla-1.9.2/browser/base/content/utilityOverlay.js
--- mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates 2010-06-13 15:36:16.617677299 -0700
+++ mozilla-1.9.2/browser/base/content/utilityOverlay.js 2010-06-13 15:39:54.485387418 -0700
@@ -510,7 +510,7 @@ function buildHelpMenu()
// Disable the UI if the update enabled pref has been locked by the
// administrator or if we cannot update for some other reason
var checkForUpdates = document.getElementById("checkForUpdates");
- var canCheckForUpdates = updates.canCheckForUpdates;
+ var canCheckForUpdates = updates.canCheckForUpdates && updates.canApplyUpdates;
checkForUpdates.setAttribute("disabled", !canCheckForUpdates);
if (!canCheckForUpdates)
return;

View File

@ -29,6 +29,7 @@ ac_add_options --enable-safe-browsing
ac_add_options --enable-libnotify ac_add_options --enable-libnotify
ac_add_options --disable-necko-wifi ac_add_options --disable-necko-wifi
ac_add_options --disable-cpp-exceptions ac_add_options --disable-cpp-exceptions
ac_add_options --disable-updater
export BUILD_OFFICIAL=1 export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1

View File

@ -53,7 +53,6 @@ Patch1: firefox4-jemalloc.patch
Patch2: firefox4-build-throw.patch Patch2: firefox4-build-throw.patch
# Fedora patches # Fedora patches
Patch10: firefox-disable-checkupdates.patch
Patch11: firefox-default.patch Patch11: firefox-default.patch
# Upstream patches # Upstream patches
@ -107,7 +106,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
%patch2 -p1 -b .throw %patch2 -p1 -b .throw
# Fedora patches # Fedora patches
%patch10 -p1 -b .checkupdates
%patch11 -p2 -b .default %patch11 -p2 -b .default
%if %{official_branding} %if %{official_branding}