From 5cb51148c69a689cb692c797c78adeca1439ae89 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Apr 26 2016 20:47:44 +0000
Subject: Manual debranding after automatic debranding failure


---

diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/firefox-centos-default-bookmarks.html b/SOURCES/firefox-centos-default-bookmarks.html
new file mode 100644
index 0000000..95a34bd
--- /dev/null
+++ b/SOURCES/firefox-centos-default-bookmarks.html
@@ -0,0 +1,21 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<!-- This is an automatically generated file.
+It will be read and overwritten.
+Do Not Edit! -->
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+
+<DL><p>
+    <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="994788142" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
+    <DL><p>
+        <DT><A HREF="http://www.centos.org/" ADD_DATE="994787542" LAST_VISIT="994788277" LAST_CHARSET="ISO-8859-1">CentOS</A>
+        <DT><H3 ADD_DATE="994787811" LAST_MODIFIED="994788115" ID="NC:BookmarksRoot#$7957b8a">Support</H3>
+        <DL><p>
+            <DT><A HREF="http://www.centos.org/modules/newbb/" ADD_DATE="994787936">CentOS Forums</A>
+            <DT><A HREF="http://www.centos.org/modules/tinycontent/index.php?id=16" ADD_DATE="994787936">CentOS Mailing-Lists</A>
+            <DT><A HREF="http://www.centos.org/docs/" ADD_DATE="994787827" LAST_VISIT="994788333" LAST_CHARSET="ISO-8859-1">CentOS Documentation</A>
+            <DT><A HREF="http://wiki.centos.org/" ADD_DATE="994787827" LAST_VISIT="994788333" LAST_CHARSET="ISO-8859-1">CentOS Wiki</A>
+        </DL><p>
+    </DL><p>
+</DL><p>
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
new file mode 100644
index 0000000..fd3108f
--- /dev/null
+++ b/SOURCES/firefox-centos-default-prefs.js
@@ -0,0 +1,27 @@
+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("extensions.shownSelectionUI",         true);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+pref("browser.tabs.remote.autostart",       false);
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 5692847..8a2bfab 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -104,7 +104,7 @@ Source0:        firefox-%{version}%{?ext_version}.source.tar.xz
 Source1:        firefox-langpacks-%{version}%{?ext_version}-20160421.tar.xz
 %endif
 Source10:       firefox-mozconfig
-Source12:       firefox-redhat-default-prefs.js
+Source12:       firefox-centos-default-prefs.js
 Source20:       firefox.desktop
 Source500:      firefox.sh.in.rhel5
 Source600:      firefox.sh.in.rhel6
@@ -117,7 +117,7 @@ Source300:      gcc48-%{gcc_version}.el5.src.rpm
 Source301:      yasm-1.2.0-3.el5.src.rpm
 Source302:      devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
 # RHEL5 bookmarks
-Source501:       firefox-redhat-default-bookmarks.html
+Source501:       firefox-centos-default-bookmarks.html
 
 # Build patches
 Patch0:         firefox-install-dir.patch
@@ -937,6 +937,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 26 2016 Johnny Hughes <johnny@centos.org> - 45.1.0-1
+- Roll in CentOS Branding
+
 * Thu Apr 21 2016 Jan Horak <jhorak@redhat.com> - 45.1.0-1
 - Update to 45.1.0 ESR