From 7299be3e69c52fba9bbe3d26d8f1adcd54996f18 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 15:17:43 +0000 Subject: import firefox-52.7.3-1.el7_5 --- diff --git a/.firefox.metadata b/.firefox.metadata index 24b9e50..c363705 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz 467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -7895d445ee7fa7f51ce253483250c7915e74a45e SOURCES/firefox-52.7.2esr.source.tar.xz -e8c600102e07347b103795d8706098cd62f0feb1 SOURCES/firefox-langpacks-52.7.2esr-20180316.tar.xz +554190b6cbaab895ced8061abfd9ac6c955950f4 SOURCES/firefox-52.7.3esr.source.tar.xz +2da0af1985ee15d174bd8ae54aeb736880b77ae6 SOURCES/firefox-langpacks-52.7.3esr-20180328.tar.xz e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.gitignore b/.gitignore index 9b508d6..b7942f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/Python-2.7.8.tgz SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -SOURCES/firefox-52.7.2esr.source.tar.xz -SOURCES/firefox-langpacks-52.7.2esr-20180316.tar.xz +SOURCES/firefox-52.7.3esr.source.tar.xz +SOURCES/firefox-langpacks-52.7.3esr-20180328.tar.xz SOURCES/gcc48-4.8.2-16.el5.src.rpm SOURCES/yasm-1.2.0-3.el5.src.rpm 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 35e3629..3d256b0 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -76,7 +76,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 52.7.2 +Version: 52.7.3 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -88,10 +88,10 @@ Group: Applications/Internet # From ftp://archive.mozilla.org/pub/firefox/releases/%{version}%{?ext_version}/source Source0: firefox-%{version}%{?ext_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?ext_version}-20180316.tar.xz +Source1: firefox-langpacks-%{version}%{?ext_version}-20180328.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source600: firefox.sh.in.rhel6 Source700: firefox.sh.in.rhel7 @@ -885,8 +885,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Mar 19 2018 Johnny Hughes - 52.7.2-1 -- Manual CentOS Debranding +* Wed Mar 28 2018 Jan Horak - 52.7.3-1 +- Update to 52.7.3 ESR * Fri Mar 16 2018 Jan Horak - 52.7.2-1 - Update to 52.7.2 ESR