From df0172c5dab9b48efe2f483f26137623ccd5ac9b Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Wed, 10 Sep 2014 12:43:04 +0200
Subject: Fix for geolocation api

---
 firefox-mozconfig               | 1 +
 firefox-redhat-default-prefs.js | 1 +
 firefox.spec                    | 8 +++++++-
 mozilla-api-key                 | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-api-key

diff --git a/firefox-mozconfig b/firefox-mozconfig
index 5eae093..c3ca652 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -35,6 +35,7 @@ ac_add_options --disable-gnomevfs
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-pulseaudio
 ac_add_options --with-system-icu
+ac_add_options --with-mozilla-api-keyfile=mozilla-api-key
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index 99e7a90..32464c6 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -18,3 +18,4 @@ pref("ui.SpellCheckerUnderlineStyle",       1);
 pref("startup.homepage_override_url",       "");
 pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=about:newtab");
 pref("browser.newtabpage.pinned",           '[{"url":"http://start.fedoraproject.org/","title":"Fedora Project - Start Page"}]');
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff --git a/firefox.spec b/firefox.spec
index 5fa798a..a7da769 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -87,7 +87,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        32.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -101,6 +101,7 @@ Source12:       firefox-redhat-default-prefs.js
 Source20:       firefox.desktop
 Source21:       firefox.sh.in
 Source23:       firefox.1
+Source24:       mozilla-api-key
 
 #Build patches
 Patch0:         firefox-install-dir.patch
@@ -246,6 +247,8 @@ cd %{tarballdir}
 %if %{official_branding}
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
+%{__cp} %{SOURCE24} mozilla-api-key
+
 %if %{?system_nss}
 echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
@@ -643,6 +646,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Sep 10 2014 Jan Horak <jhorak@redhat.com> - 32.0-1
+- Fix for geolocation API (rhbz#1063739)
+
 * Tue Aug 26 2014 Martin Stransky <stransky@redhat.com> - 32.0-1
 - Update to 32.0 build 1
 
diff --git a/mozilla-api-key b/mozilla-api-key
new file mode 100644
index 0000000..81877bc
--- /dev/null
+++ b/mozilla-api-key
@@ -0,0 +1 @@
+9008bb7e-1e22-4038-94fe-047dd48ccc0b
-- 
cgit