diff --git a/.firefox.metadata b/.firefox.metadata
index 769164f..7eef646 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,6 +1,6 @@
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
-ace3cfe04d1a44677850c388f7dbb17ec19cae24 SOURCES/firefox-60.2.0esr.source.tar.xz
-cec872816b104c904a81415b25bec7ed1dc70fde SOURCES/firefox-langpacks-60.2.0esr-20180831.tar.xz
+a1b9d039630a1029c7c5423a6fa1dbef34acb0fe SOURCES/firefox-60.2.1esr.source.tar.xz
+0823faf94afddc59ebecd1a952f2747efbe854a7 SOURCES/firefox-langpacks-60.2.1esr-20180924.tar.xz
6724218efbb1f3fa14541cb2f255970b98446a45 SOURCES/firefox-symbolic.svg
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
diff --git a/.gitignore b/.gitignore
index ba0d10e..1b78e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
SOURCES/Python-2.7.13.tar.xz
-SOURCES/firefox-60.2.0esr.source.tar.xz
-SOURCES/firefox-langpacks-60.2.0esr-20180831.tar.xz
+SOURCES/firefox-60.2.1esr.source.tar.xz
+SOURCES/firefox-langpacks-60.2.1esr-20180924.tar.xz
SOURCES/firefox-symbolic.svg
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
deleted file mode 100644
index 70e45ff..0000000
--- a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200
-@@ -25,10 +25,13 @@ SignalTrampoline(int aSignal, siginfo_t*
- "nop; nop; nop; nop"
- : : : "memory");
-
-+ // Because the assembler may generate additional insturctions below, we
-+ // need to ensure NOPs are inserted first by separating them out above.
-+
- asm volatile (
-- "b %0"
-+ "bx %0"
- :
-- : "X"(H)
-+ : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext)
- : "memory");
- }
-
diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini
index 0a0429e..8bf461e 100644
--- a/SOURCES/distribution.ini
+++ b/SOURCES/distribution.ini
@@ -1,7 +1,7 @@
[Global]
id=redhat
version=1.0
-about=Mozilla Firefox for CentOS Linux
+about=Mozilla Firefox for Red Hat Enterprise Linux
[Preferences]
app.distributor=redhat
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index f0e4a19..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,33 +0,0 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("general.smoothScroll", true);
-pref("intl.locale.matchOS", true);
-pref("toolkit.storage.synchronous", 0);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-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("network.manage-offline-status", true);
-pref("extensions.shownSelectionUI", true);
-pref("ui.SpellCheckerUnderlineStyle", 1);
-pref("startup.homepage_override_url", "http://www.centos.org");
-pref("startup.homepage_welcome_url", "http://www.centos.org");
-pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-pref("media.gmp-gmpopenh264.provider.enabled",false);
-pref("media.gmp-gmpopenh264.autoupdate",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("plugins.notifyMissingFlash", false);
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
-pref("browser.display.use_system_colors", false);
-pref("layers.use-image-offscreen-surfaces", false);
-/* Allow sending credetials to all https:// sites */
-pref("network.negotiate-auth.trusted-uris", "https://");
-pref("security.use_sqldb", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
diff --git a/SOURCES/firefox-mozconfig b/SOURCES/firefox-mozconfig
old mode 100644
new mode 100755
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
new file mode 100644
index 0000000..71d6506
--- /dev/null
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -0,0 +1,33 @@
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("general.smoothScroll", true);
+pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+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("network.manage-offline-status", true);
+pref("extensions.shownSelectionUI", true);
+pref("ui.SpellCheckerUnderlineStyle", 1);
+pref("startup.homepage_override_url", "http://www.redhat.com");
+pref("startup.homepage_welcome_url", "http://www.redhat.com");
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+pref("media.gmp-gmpopenh264.provider.enabled",false);
+pref("media.gmp-gmpopenh264.autoupdate",false);
+pref("media.gmp-gmpopenh264.enabled",false);
+pref("media.gmp-gmpopenh264.enabled",false);
+pref("plugins.notifyMissingFlash", false);
+/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
+pref("browser.display.use_system_colors", false);
+pref("layers.use-image-offscreen-surfaces", false);
+/* Allow sending credetials to all https:// sites */
+pref("network.negotiate-auth.trusted-uris", "https://");
+pref("security.use_sqldb", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 3a8456f..7ab6228 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -122,7 +122,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 60.2.0
+Version: 60.2.1
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -135,10 +135,10 @@ ExclusiveArch: i686 x86_64 ppc64 s390x
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20180831.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20180924.tar.xz
%endif
Source10: firefox-mozconfig
-Source12: firefox-centos-default-prefs.js
+Source12: firefox-redhat-default-prefs.js
Source20: firefox.desktop
Source21: firefox.sh.in
Source23: firefox.1
@@ -192,9 +192,6 @@ Patch415: mozilla-1436242.patch
# Debian patches
-# CentOS armhfp patch
-Patch1000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-
%if %{?system_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
BuildRequires: pkgconfig(nss) >= %{nss_version}
@@ -424,11 +421,6 @@ This package contains results of tests executed during build.
%patch26 -p1 -b .icu
%endif
-# CentOS armhfp patch
-%ifarch %{arm}
-%patch1000 -p1 -b .mozilla-1238661
-%endif
-
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
%if %{official_branding}
@@ -1150,8 +1142,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Wed Sep 12 2018 Johnny Hughes <johnny@centos.org> - 60.2.0-1
-- Manual CentOS Debranding
+* Mon Sep 24 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-1
+- Update to 60.2.1 ESR
* Fri Aug 31 2018 Jan Horak <jhorak@redhat.com> - 60.2.0-1
- Update to 60.2.0 ESR