diff options
| -rw-r--r-- | firefox-disable-checkupdates.patch | 12 | ||||
| -rwxr-xr-x | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox.spec | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/firefox-disable-checkupdates.patch b/firefox-disable-checkupdates.patch deleted file mode 100644 index e3b8c97..0000000 --- a/firefox-disable-checkupdates.patch +++ /dev/null @@ -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; diff --git a/firefox-mozconfig b/firefox-mozconfig index d081ddd..8c10f29 100755 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -29,6 +29,7 @@ ac_add_options --enable-safe-browsing ac_add_options --enable-libnotify ac_add_options --disable-necko-wifi ac_add_options --disable-cpp-exceptions +ac_add_options --disable-updater export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/firefox.spec b/firefox.spec index c8aed32..a2d2506 100644 --- a/firefox.spec +++ b/firefox.spec @@ -53,7 +53,6 @@ Patch1: firefox4-jemalloc.patch Patch2: firefox4-build-throw.patch # Fedora patches -Patch10: firefox-disable-checkupdates.patch Patch11: firefox-default.patch # Upstream patches @@ -107,7 +106,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \ %patch2 -p1 -b .throw # Fedora patches -%patch10 -p1 -b .checkupdates %patch11 -p2 -b .default %if %{official_branding} |