From 4acbcb33023e8132d1497b39ded44d64102d6f22 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Sun, 3 Apr 2011 20:16:30 -0700
Subject: Use upstream's version of our patch to set the default browser

When setting the default browser, we want to set it to 'firefox %s'
instead of '/usr/lib{,64}/firefox-4/firefox %s'

firefox-default.patch did the job for us for a bit, but upstream now
has a patch to do this which we can now use.  The patch will check
to see if MOZ_APP_LAUNCHER is passed, and if so, it will use only
the basename when setting the default browser.  We already set
MOZ_APP_LAUNCHER, so just need to switch to using the patch.

From https://bugzilla.mozilla.org/show_bug.cgi?id=611953
Patch 1 - Use MOZ_APP_LAUNCHER for default browser executable (v3, un-bitrotted)
---
 firefox.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'firefox.spec')

diff --git a/firefox.spec b/firefox.spec
index b353830..b1919e2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -65,9 +65,9 @@ Source23:       firefox.1
 Patch0:         firefox-version.patch
 
 # Fedora patches
-Patch11:        firefox-default.patch
 
 # Upstream patches
+Patch30:        firefox-4.0-moz-app-launcher.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -111,7 +111,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{firefox_dir_ver}/' %{P:%%PATCH0} \
 # For branding specific patches.
 
 # Fedora patches
-%patch11 -p1 -b .default
+
+# Upstream patches
+%patch30 -p1 -b .moz-app-launcher
 
 %if %{official_branding}
 # Required by Mozilla Corporation
-- 
cgit