diff --git a/.firefox.metadata b/.firefox.metadata index 13631eb..b815576 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 -5cb8fadef4a42aa49b6e210ff9172c666f4495a9 SOURCES/firefox-45.5.1esr.source.tar.xz -01e366387aee12773d7baf0c888a3be0b748b8d1 SOURCES/firefox-langpacks-45.5.1esr-20161130.tar.xz +4dda3d1965aabf0963de43180e6cadfc4ce6f650 SOURCES/firefox-45.6.0esr.source.tar.xz +e3754cfeaf4a7d806c6736cdf88a31843b293954 SOURCES/firefox-langpacks-45.6.0esr-20161211.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 a27d161..63e0727 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-45.5.1esr.source.tar.xz -SOURCES/firefox-langpacks-45.5.1esr-20161130.tar.xz +SOURCES/firefox-45.6.0esr.source.tar.xz +SOURCES/firefox-langpacks-45.6.0esr-20161211.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-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 @@ - - - -
-
-
-
-
-
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 35c024c..c94badc 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -28,7 +28,6 @@
# SHOULD ALWAYS BE 0 WHEN BUILDING IN BREW
%define do_not_clean_rpms 0
-
# Configure and override build options for various platforms and RHEL versions
# ============================================================================
@@ -88,7 +87,7 @@ ExcludeArch: ppc ia64
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 45.5.1
+Version: 45.6.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -100,10 +99,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}-20161130.tar.xz
+Source1: firefox-langpacks-%{version}%{?ext_version}-20161211.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
@@ -116,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
@@ -952,8 +951,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Thu Dec 01 2016 CentOS Sources