From ff858bef6067865067642615e5921af42e897264 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 09 2016 04:18:19 +0000 Subject: import firefox-38.7.0-1.el7_2 --- diff --git a/.firefox.metadata b/.firefox.metadata index 5451bb1..6fd15b0 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,3 +1,3 @@ -b3b5712ba27e70536cd589ec212b42518819871b SOURCES/firefox-38.6.1esr.source.tar.bz2 -9849ba820ee2331bf2d5b4d21335485de703336f SOURCES/firefox-langpacks-38.6.1esr-20160211.tar.bz2 +42dbd9ef7e3b5b4aabd2dee602e982146b457d18 SOURCES/firefox-38.7.0esr.source.tar.bz2 +32d36274e5bf94aed292945bb2653918f66b057e SOURCES/firefox-langpacks-38.7.0esr-20160303.tar.bz2 39c11b21e3a50ea91d0b99d6ee6500e2e1377267 SOURCES/gcc48-4.8.2-15.el6.src.rpm diff --git a/.gitignore b/.gitignore index c83a7a4..14a642b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/firefox-38.6.1esr.source.tar.bz2 -SOURCES/firefox-langpacks-38.6.1esr-20160211.tar.bz2 +SOURCES/firefox-38.7.0esr.source.tar.bz2 +SOURCES/firefox-langpacks-38.7.0esr-20160303.tar.bz2 SOURCES/gcc48-4.8.2-15.el6.src.rpm diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index e894b72..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,29 +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"); -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", true); -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%"); -perf("loop.enabled", true); diff --git a/SOURCES/firefox-nss-3.19.1.patch b/SOURCES/firefox-nss-3.19.1.patch index 44f6519..b31417b 100644 --- a/SOURCES/firefox-nss-3.19.1.patch +++ b/SOURCES/firefox-nss-3.19.1.patch @@ -14,7 +14,7 @@ diff -up mozilla-esr38/configure.in.nss-3.19.1 mozilla-esr38/configure.in _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.19.2.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.19.2.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.19.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..81ed19d --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,29 @@ +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"); +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", true); +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%"); +perf("loop.enabled", true); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 8c6360f..bc4c14c 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -59,7 +59,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 38.6.1 +Version: 38.7.0 Release: 1%{?prever}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -68,11 +68,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}-20160211.tar.bz2 +Source1: firefox-langpacks-%{version}%{?ext_version}-20160303.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 @@ -670,8 +670,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Feb 16 2016 CentOS Sources - 38.6.1-1.el7.centos -- CentOS default prefs +* Thu Mar 3 2016 Jan Horak - 38.7.0-1 +- Update to 38.7.0 ESR * Thu Feb 11 2016 Martin Stransky - 38.6.1-1 - Update to 38.6.1 ESR