From b4f789d4d92ce87b36973c5f1fa1519fc136bd02 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2015 18:25:46 +0000 Subject: import firefox-31.6.0-2.el7_1 --- diff --git a/.firefox.metadata b/.firefox.metadata index 9cb00f8..f98525d 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,2 +1,2 @@ -dca36af3ae3c5a19c4ceeaf22b1d4c119f412d8a SOURCES/firefox-31.5.3esr.source.tar.bz2 -17c823ec2419ea86ac5d9c3d8604ac314c0173e2 SOURCES/firefox-langpacks-31.5.3esr-20150321.tar.bz2 +9c13012fec260c672e0e97ffb29f36fe360b02ad SOURCES/firefox-31.6.0esr.source.tar.bz2 +f8a36ea3087563eea6f1802578769d38bed294e9 SOURCES/firefox-langpacks-31.6.0esr-20150325.tar.bz2 diff --git a/.gitignore b/.gitignore index e057370..777d548 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/firefox-31.5.3esr.source.tar.bz2 -SOURCES/firefox-langpacks-31.5.3esr-20150321.tar.bz2 +SOURCES/firefox-31.6.0esr.source.tar.bz2 +SOURCES/firefox-langpacks-31.6.0esr-20150325.tar.bz2 diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index ee2943f..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,24 +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("javascript.options.baselinejit.content", false); -pref("javascript.options.baselinejit.chrome", false); -pref("extensions.shownSelectionUI", true); -pref("layout.imagevisibility.enabled", false); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 1e8891f..71ac4a8 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -55,19 +55,19 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 31.5.3 -Release: 3%{?prever}%{?dist} +Version: 31.6.0 +Release: 2%{?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}-20150321.tar.bz2 +Source1: firefox-langpacks-%{version}%{?ext_version}-20150325.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 @@ -527,8 +527,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Mar 24 2015 CentOS Sources - 31.5.3-3.el7.centos -- CentOS default prefs +* Thu Mar 26 2015 Martin Stransky - 31.6.0-2 +- Update to 31.6.0 ESR Build 2 + +* Wed Mar 25 2015 Jan Horak - 31.6.0-1 +- Update to 31.6.0 ESR * Sat Mar 21 2015 Martin Stransky - 31.5.3-3 - Update to 31.5.3 ESR