From 3ab4565aef7dd08c6b6dfda8c04611e5a3132a81 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 11 2019 16:58:52 +0000
Subject: import firefox-60.8.0-1.el8_0


---

diff --git a/.firefox.metadata b/.firefox.metadata
index d1c5ccb..8749ce9 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,6 +1,6 @@
 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
-508045d500929ff0ae7228d38d91d46b48d69fce SOURCES/firefox-60.7.2esr.source.tar.xz
-09d7013856ef5fbed169cb54ad350dd0eb6f5a61 SOURCES/firefox-langpacks-60.7.2esr-20190620.tar.xz
+9320eae9a8ef2df82b64cfa326a0998610bdb6bb SOURCES/firefox-60.8.0esr.source.tar.xz
+d12ad99bd520f3997652a6cf0dccc347b066368b SOURCES/firefox-langpacks-60.8.0esr-20190703.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 3493226..7752a4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 SOURCES/Python-2.7.13.tar.xz
-SOURCES/firefox-60.7.2esr.source.tar.xz
-SOURCES/firefox-langpacks-60.7.2esr-20190620.tar.xz
+SOURCES/firefox-60.8.0esr.source.tar.xz
+SOURCES/firefox-langpacks-60.8.0esr-20190703.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/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/build-nss-version.patch b/SOURCES/build-nss-version.patch
deleted file mode 100644
index 94947f2..0000000
--- a/SOURCES/build-nss-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-60.1.0/old-configure.in.nss-version firefox-60.1.0/old-configure.in
---- firefox-60.1.0/old-configure.in.nss-version	2018-06-20 14:24:55.204158540 +0200
-+++ firefox-60.1.0/old-configure.in	2018-06-20 14:30:19.517004230 +0200
-@@ -1768,7 +1768,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
-     _USE_SYSTEM_NSS=1 )
- 
- if test -n "$_USE_SYSTEM_NSS"; then
--    AM_PATH_NSS(3.36.7, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+    AM_PATH_NSS(3.36.0, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
- 
- if test -z "$MOZ_SYSTEM_NSS"; then
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index c813feb..a29919d 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -88,7 +88,7 @@
 # we're building against could bring us some broken dependencies from time to time.
 #%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.36.0
+%global nss_version 3.36.8
 #%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %global nss_build_version %{nss_version}
 %endif
@@ -141,8 +141,8 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        60.7.2
-Release:        3%{?pre_tag}%{?dist}
+Version:        60.8.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 %if 0%{?rhel} == 7
@@ -154,7 +154,7 @@ 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}-20190620.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20190703.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source12:       firefox-redhat-default-prefs.js
@@ -182,7 +182,7 @@ Source100:      https://www.python.org/ftp/python/%{bundled_python_version}/Pyth
 Patch3:         mozilla-build-arm.patch
 Patch4:         build-mozconfig-fix.patch
 Patch5:         build-gdk-version.patch
-Patch6:         build-nss-version.patch
+#Patch6:         build-nss-version.patch
 Patch26:        build-icu-big-endian.patch
 # Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268
 Patch29:        build-big-endian.patch
@@ -456,7 +456,7 @@ https://extensions.gnome.org.
 %patch3  -p1 -b .arm
 %patch4  -p1 -b .build-mozconfig-fix
 %patch5  -p1 -b .gdk-version
-%patch6  -p1 -b .nss-version
+#%patch6  -p1 -b .nss-version
 
 # Fedora patches
 %patch215 -p1 -b .addons