From 9e38fb58e17b08f02396afe610cebdd47f7a677d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 10 Aug 2021 04:21:10 +0000
Subject: [PATCH] import firefox-78.13.0-2.el8_4

---
 .firefox.metadata  |  4 ++--
 .gitignore         |  4 ++--
 SPECS/firefox.spec | 25 +++++++++++++++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.firefox.metadata b/.firefox.metadata
index 7b0cc17..8456303 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,7 +1,7 @@
 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
 a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-83ae378d8bddd9efc5badb99a6246979313f7134 SOURCES/firefox-78.12.0esr.source.tar.xz
-a469453c2e84de2a22dccdb53ab8ca997cddd127 SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz
+0da70b30de24716246dd090cf4b3245c91c5931c SOURCES/firefox-78.13.0esr.source.tar.xz
+140765234e3d4340710e09632d9af4a88ea10ba7 SOURCES/firefox-langpacks-78.13.0esr-20210805.tar.xz
 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm
diff --git a/.gitignore b/.gitignore
index 23a60dc..833586a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 SOURCES/Python-2.7.13.tar.xz
 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-SOURCES/firefox-78.12.0esr.source.tar.xz
-SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz
+SOURCES/firefox-78.13.0esr.source.tar.xz
+SOURCES/firefox-langpacks-78.13.0esr-20210805.tar.xz
 SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 SOURCES/nodejs-10.21.0-5.fc32.src.rpm
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index d12f6d3..874c55f 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -16,6 +16,10 @@ function dist_to_rhel_minor(str, start)
   if match then
      return string.sub(match, 6)
   end
+  match = string.match(str, ".el8")
+  if match then
+     return 5
+  end
   return -1
 end}
 
@@ -124,7 +128,7 @@ end}
 # Build as a debug package?
 %global debug_build       0
 
-#%global default_bookmarks_file  %{_datadir}/bookmarks/default-bookmarks.html
+#%%global default_bookmarks_file  %%{_datadir}/bookmarks/default-bookmarks.html
 # need to use full path because of flatpak where datadir is /app/share
 %global default_bookmarks_file  /usr/share/bookmarks/default-bookmarks.html
 %global firefox_app_id  \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -139,10 +143,10 @@ end}
 %global nspr_version 4.25
 # NSS/NSPR quite often ends in build override, so as requirement the version
 # 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 %%(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
 %global nspr_build_version %{nspr_version}
 %global nss_version 3.53.1
-#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
+#%%global nss_build_version %%(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %global nss_build_version %{nss_version}
 %endif
 
@@ -210,8 +214,8 @@ end}
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        78.12.0
-Release:        1%{?dist}
+Version:        78.13.0
+Release:        2%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 %if 0%{?rhel} == 7
@@ -223,7 +227,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}-20210707.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20210805.tar.xz
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
 Source10:       firefox-mozconfig
@@ -1685,6 +1689,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 05 2021 Eike Rathke <erack@redhat.com> - 78.13.0-2
+- Update to 78.13.0 build2
+
+* Tue Aug 03 2021 Eike Rathke <erack@redhat.com> - 78.13.0-1
+- Update to 78.13.0 build1
+
+* Fri Jul 16 2021 Jan Horak <jhorak@redhat.com> - 78.12.0-2
+- Rebuild to pickup older nss
+
 * Wed Jul 07 2021 Eike Rathke <erack@redhat.com> - 78.12.0-1
 - Update to 78.12.0 build1