From 162dd94bb6d79e6d9c0959524b271ee8f9d1079a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 03 2014 17:32:57 +0000
Subject: import firefox-24.8.0-1.el7_0


---

diff --git a/.firefox.metadata b/.firefox.metadata
index 1a5b432..8fd7ec4 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,2 +1,2 @@
-b5c2df8726846b40bcb320892cddda2b5ec44dd3 SOURCES/firefox-langpacks-24.7.0esr-20140717.tar.bz2
-b7d93b2d8af7028670b6fa17177e4316670d3724 SOURCES/firefox-24.7.0esr.source.tar.bz2
+7aad03b3152778b1902c102d9c0f99e5528833fa SOURCES/firefox-24.8.0esr.source.tar.bz2
+567daed3dd20872e2fbf53fb3ef258b693b65aee SOURCES/firefox-langpacks-24.8.0esr-20140826.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5a34509..27667ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/firefox-langpacks-24.7.0esr-20140717.tar.bz2
-SOURCES/firefox-24.7.0esr.source.tar.bz2
+SOURCES/firefox-24.8.0esr.source.tar.bz2
+SOURCES/firefox-langpacks-24.8.0esr-20140826.tar.bz2
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index ee2943f..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,24 +0,0 @@
-pref("app.update.auto",                     false);
-pref("app.update.enabled",                  false);
-pref("app.update.autoInstallEnabled",       false);
-pref("browser.backspace_action",            2);
-pref("browser.display.use_system_colors",   true);
-pref("browser.download.folderList",         1);
-pref("browser.link.open_external",          3);
-pref("browser.shell.checkDefaultBrowser",   false);
-pref("general.smoothScroll",                true);
-pref("general.useragent.vendor",            "CentOS");
-pref("general.useragent.vendorSub",         "FIREFOX_RPM_VR");
-pref("intl.locale.matchOS",                 true);
-pref("storage.nfs_filesystem",              false);
-pref("dom.ipc.plugins.enabled.nswrapper*",  false);
-pref("network.manage-offline-status",       true);
-pref("toolkit.networkmanager.disable", false);
-pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
-pref("toolkit.storage.synchronous",         0);
-pref("startup.homepage_override_url",       "http://www.centos.org");
-pref("startup.homepage_welcome_url",        "http://www.centos.org");
-pref("javascript.options.baselinejit.content", false);
-pref("javascript.options.baselinejit.chrome", false);
-pref("extensions.shownSelectionUI",         true);
-pref("layout.imagevisibility.enabled",      false);
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
new file mode 100644
index 0000000..2a22d05
--- /dev/null
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -0,0 +1,24 @@
+pref("app.update.auto",                     false);
+pref("app.update.enabled",                  false);
+pref("app.update.autoInstallEnabled",       false);
+pref("browser.backspace_action",            2);
+pref("browser.display.use_system_colors",   true);
+pref("browser.download.folderList",         1);
+pref("browser.link.open_external",          3);
+pref("browser.shell.checkDefaultBrowser",   false);
+pref("general.smoothScroll",                true);
+pref("general.useragent.vendor",            "Red Hat");
+pref("general.useragent.vendorSub",         "FIREFOX_RPM_VR");
+pref("intl.locale.matchOS",                 true);
+pref("storage.nfs_filesystem",              false);
+pref("dom.ipc.plugins.enabled.nswrapper*",  false);
+pref("network.manage-offline-status",       true);
+pref("toolkit.networkmanager.disable", false);
+pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
+pref("toolkit.storage.synchronous",         0);
+pref("startup.homepage_override_url",       "http://www.redhat.com");
+pref("startup.homepage_welcome_url",        "http://www.redhat.com");
+pref("javascript.options.baselinejit.content", false);
+pref("javascript.options.baselinejit.chrome", false);
+pref("extensions.shownSelectionUI",         true);
+pref("layout.imagevisibility.enabled",      false);
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 718d907..06632d3 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -53,7 +53,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        24.7.0
+Version:        24.8.0
 Release:        1%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -61,11 +61,11 @@ Group:          Applications/Internet
 # From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
 Source0:        firefox-%{version}%{?prever}%{?ext_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?ext_version}-20140717.tar.bz2
+Source1:        firefox-langpacks-%{version}%{?ext_version}-20140826.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
-Source12:       firefox-centos-default-prefs.js
+Source12:       firefox-redhat-default-prefs.js
 Source20:       firefox.desktop
 Source21:       firefox.sh.in
 Source23:       firefox.1
@@ -506,8 +506,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Jul 22 2014 Johnny Hughes <johnny@centos.org> - 24.7.0-1.el7.centos
-- Roll in CentOS Branding
+* Tue Aug 26 2014 Martin Stransky <stransky@redhat.com> - 24.8.0-1
+- Update to 24.8.0 ESR
 
 * Thu Jul 17 2014 Jan Horak <jhorak@redhat.com> - 24.7.0-1
 - Update to 24.7.0 ESR