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 @@ + + + +Bookmarks +

Bookmarks

+ +

+

Personal Toolbar Folder

+

+

CentOS +

Support

+

+

CentOS Forums +
CentOS Mailing-Lists +
CentOS Documentation +
CentOS Wiki +

+

+

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/SOURCES/firefox-redhat-default-bookmarks.html b/SOURCES/firefox-redhat-default-bookmarks.html deleted file mode 100644 index 042ccdc..0000000 --- a/SOURCES/firefox-redhat-default-bookmarks.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -Bookmarks -

Bookmarks

- -

-

Personal Toolbar Folder

-

-

Red Hat -
Red Hat Magazine -
Red Hat Network -
Red Hat Support -

-

diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js deleted file mode 100644 index 02113f4..0000000 --- a/SOURCES/firefox-redhat-default-prefs.js +++ /dev/null @@ -1,27 +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", "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("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 be27457..f238f90 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -103,7 +103,7 @@ Source0: firefox-%{version}%{?ext_version}.source.tar.xz Source1: firefox-langpacks-%{version}%{?ext_version}-20160603.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 @@ -116,7 +116,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 @@ -941,6 +941,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Jun 8 2016 Johnny Hughes - 45.2.0-1 +- Roll in CentOS Branding + * Fri Jun 3 2016 Jan Horak - 45.2.0-1 - Update to 45.2.0 ESR