From acfdf5aa50d95a86883c8b8069932f207771e812 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 21 2017 10:15:16 +0000 Subject: import firefox-45.7.0-2.el7_3 --- diff --git a/SOURCES/firefox-centos-default-bookmarks.html b/SOURCES/firefox-centos-default-bookmarks.html deleted file mode 100644 index 95a34bd..0000000 --- a/SOURCES/firefox-centos-default-bookmarks.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -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 deleted file mode 100644 index fd3108f..0000000 --- a/SOURCES/firefox-centos-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", "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-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..02113f4 --- /dev/null +++ b/SOURCES/firefox-redhat-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", "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 b21f69e..8abed24 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -36,8 +36,6 @@ %ifarch s390x %define use_bundled_gcc 1 %endif -# We don't ship FF on ppc/s390 -ExcludeArch: ppc s390 %endif # RHEL6 @@ -48,8 +46,6 @@ ExcludeArch: ppc s390 %define system_ffi 0 %define enable_gstreamer 0 %define use_bundled_binutils 1 -# We don't ship FF on ppc/s390 -ExcludeArch: ppc s390 %endif # RHEL5 @@ -64,8 +60,7 @@ ExcludeArch: ppc s390 %define system_gio 0 %define system_hunspell 0 # ppc and ia64 no longer supported (rhbz#1214863, rhbz#1214865) -# We don't ship FF on s390 -ExcludeArch: ppc ia64 s390 +ExcludeArch: ppc ia64 %define system_libatomic 1 %endif @@ -93,7 +88,7 @@ ExcludeArch: ppc ia64 s390 Summary: Mozilla Firefox Web browser Name: firefox Version: 45.7.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -107,7 +102,7 @@ Source0: firefox-%{version}%{?ext_version}.source.tar.xz Source1: firefox-langpacks-%{version}%{?ext_version}-20170119.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source500: firefox.sh.in.rhel5 Source600: firefox.sh.in.rhel6 @@ -120,7 +115,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-centos-default-bookmarks.html +Source501: firefox-redhat-default-bookmarks.html # Build patches Patch0: firefox-install-dir.patch @@ -954,8 +949,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Jan 25 2017 CentOS Sources - 45.7.0-1.el7.centos -- CentOS default prefs +* Fri Feb 3 2017 Martin Stransky - 45.7.0-2 +- Enabled ppc/s390 arches (rhbz#1418765) * Thu Jan 19 2017 Martin Stransky - 45.7.0-1 - Updated to 45.7.0 (B1)