From 52c38cd1787c0ff021e5c2de54400dcdcdc753d2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 23 2019 15:32:27 +0000
Subject: import firefox-60.7.0-1.el8_0


---

diff --git a/.firefox.metadata b/.firefox.metadata
index 098fad4..49c7dde 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,6 +1,6 @@
 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
-e8195241b33efb4fbd3dcc01b744ec815f04e2c8 SOURCES/firefox-60.6.1esr.source.tar.xz
-23d945f81979719ab47e57d1eb97646f47f05e02 SOURCES/firefox-langpacks-60.6.1esr-20190325.tar.xz
+733187de6b20f8902fa207f08ec85f952a2c2e40 SOURCES/firefox-60.7.0esr.source.tar.xz
+7078da81de13917fa6c4e85f1395552bff67f056 SOURCES/firefox-langpacks-60.7.0esr-20190515.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 c469b4e..09d4148 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 SOURCES/Python-2.7.13.tar.xz
-SOURCES/firefox-60.6.1esr.source.tar.xz
-SOURCES/firefox-langpacks-60.6.1esr-20190325.tar.xz
+SOURCES/firefox-60.7.0esr.source.tar.xz
+SOURCES/firefox-langpacks-60.7.0esr-20190515.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/mozilla-526293.patch b/SOURCES/mozilla-526293.patch
new file mode 100644
index 0000000..a03796a
--- /dev/null
+++ b/SOURCES/mozilla-526293.patch
@@ -0,0 +1,14 @@
+diff -up firefox-60.6.0/widget/gtk/nsFilePicker.cpp.old firefox-60.6.0/widget/gtk/nsFilePicker.cpp
+--- firefox-60.6.0/widget/gtk/nsFilePicker.cpp.old	2019-03-27 10:29:47.918560620 +0100
++++ firefox-60.6.0/widget/gtk/nsFilePicker.cpp	2019-03-27 10:30:08.384491717 +0100
+@@ -366,9 +366,7 @@ nsFilePicker::Open(nsIFilePickerShownCal
+   // If we have --enable-proxy-bypass-protection, then don't allow
+   // remote URLs to be used.
+ #ifndef MOZ_PROXY_BYPASS_PROTECTION
+-  if (mAllowURLs) {
+-    gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
+-  }
++  gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
+ #endif
+ 
+   if (action == GTK_FILE_CHOOSER_ACTION_OPEN ||
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 82be41f..25b7f82 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -141,7 +141,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        60.6.1
+Version:        60.7.0
 Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -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}-20190325.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20190515.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source12:       firefox-redhat-default-prefs.js
@@ -204,6 +204,7 @@ Patch225:        mozilla-1005640-accept-lang.patch
 Patch226:        rhbz-1354671.patch
 Patch230:        rhbz-1503632-nss.patch
 Patch231:        firefox-pipewire.patch
+Patch232:        mozilla-526293.patch
 
 # Upstream patches
 Patch402:        mozilla-1196777.patch
@@ -465,6 +466,7 @@ https://extensions.gnome.org.
 %if 0%{?rhel} == 8
 %patch231 -p1 -b .pipewire
 %endif
+%patch232 -p1 -b .mozilla-526293
 
 # This ensures no migration of certdb to sqlite on the RHEL6 and RHEL7.
 # This needs to stay for the future releases
@@ -1219,6 +1221,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed May 15 2019 Martin Stransky <stransky@redhat.com> - 60.7.0-1
+- Updated to 60.7.0 ESR
+
+* Thu May 9 2019 Martin Stransky <stransky@redhat.com> - 60.6.3-1
+- Updated to 60.6.3 ESR
+
+* Tue May 7 2019 Martin Stransky <stransky@redhat.com> - 60.6.2-1
+- Updated to 60.6.2 ESR
+
+* Mon Mar 27 2019 Martin Stransky <stransky@redhat.com> - 60.6.1-2
+- Added fix for mozbz#526293 - show remote locations on file chooser dialog.
+
 * Mon Mar 25 2019 Martin Stransky <stransky@redhat.com> - 60.6.1-1
 - Update to 60.6.1 ESR (Build 1)