From 65ed61db99391e0ed406a9d0c1cad2da0034146e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 11 2015 17:25:03 +0000 Subject: import firefox-38.2.0-4.el7_1 --- diff --git a/.firefox.metadata b/.firefox.metadata index 5444fba..16f3c49 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,2 +1,2 @@ -63f23f65dfa324621a6613c2a0d2e29e064c6863 SOURCES/firefox-38.1.1esr.source.tar.bz2 -1f6bd1cbe3342c180594a45b6563690e11857fa5 SOURCES/firefox-langpacks-38.1.1esr-20150806.tar.bz2 +11fb31a128bf27c18765f91d0d997c5ab50b5a52 SOURCES/firefox-38.2.0esr.source.tar.bz2 +eaa85537148b264c7e27cae8e1fbf9c51c0db498 SOURCES/firefox-langpacks-38.2.0esr-20150807.tar.bz2 diff --git a/.gitignore b/.gitignore index 039a662..098d27e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/firefox-38.1.1esr.source.tar.bz2 -SOURCES/firefox-langpacks-38.1.1esr-20150806.tar.bz2 +SOURCES/firefox-38.2.0esr.source.tar.bz2 +SOURCES/firefox-langpacks-38.2.0esr-20150807.tar.bz2 diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index 93bd939..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,28 +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%"); diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..2706b38 --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,28 @@ +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%"); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 6b84ee7..892c715 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -53,19 +53,19 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 38.1.1 -Release: 1%{?prever}%{?dist} +Version: 38.2.0 +Release: 4%{?prever}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ 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}-20150806.tar.bz2 +Source1: firefox-langpacks-%{version}%{?ext_version}-20150807.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 @@ -531,8 +531,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Aug 07 2015 CentOS Sources - 38.1.1-1.el7.centos -- CentOS default prefs +* Fri Aug 7 2015 Jan Horak - 38.2.0-4 +- Update to 38.2.0 ESR * Thu Aug 6 2015 Jan Horak - 38.1.1-1 - Update to 38.1.1 ESR