Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -2,3 +2,12 @@
 /firefox-102.2.0esr.source.tar.xz
 /firefox-102.3.0esr.source.tar.xz
 /firefox-102.4.0esr.source.tar.xz
+/firefox-102.5.0esr.source.tar.xz
+/firefox-102.6.0esr.source.tar.xz
+/firefox-102.7.0esr.source.tar.xz
+/firefox-102.8.0esr.source.tar.xz
+/firefox-102.9.0esr.source.tar.xz
+/firefox-102.12.0esr.source.tar.xz
+/firefox-102.13.0esr.source.tar.xz
+/firefox-102.15.0esr.source.tar.xz
+/firefox-102.15.1esr.source.tar.xz

0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch

@@ -1,109 +0,0 @@
-From 0e790bd2eb846e90495eb81952cf35cc7fc8766a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 27 Jun 2022 19:55:16 +0100
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/backend/base.py                | 2 +-
- python/mozbuild/mozbuild/preprocessor.py                | 6 +++---
- python/mozbuild/mozbuild/util.py                        | 4 ++--
- python/mozbuild/mozpack/files.py                        | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index f1d401a..aca59d0 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
-     ) and not config.substs.get("JS_STANDALONE"):
-         config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
-
--    with open(path, "rU") as input:
-+    with open(path, "r") as input:
-         r = re.compile(
-             "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
-         )
-diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
-index 7bc1986..b64a709 100644
---- a/python/mozbuild/mozbuild/backend/base.py
-+++ b/python/mozbuild/mozbuild/backend/base.py
-@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
-         return status
-
-     @contextmanager
--    def _write_file(self, path=None, fh=None, readmode="rU"):
-+    def _write_file(self, path=None, fh=None, readmode="r"):
-         """Context manager to write a file.
-
-         This is a glorified wrapper around FileAvoidWrite with integration to
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index f7820b9..857f1a6 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -531,7 +531,7 @@ class Preprocessor:
-
-         if args:
-             for f in args:
--                with io.open(f, "rU", encoding="utf-8") as input:
-+                with io.open(f, "r", encoding="utf-8") as input:
-                     self.processFile(input=input, output=out)
-             if depfile:
-                 mk = Makefile()
-@@ -860,7 +860,7 @@ class Preprocessor:
-                     args = self.applyFilters(args)
-                 if not os.path.isabs(args):
-                     args = os.path.join(self.curdir, args)
--                args = io.open(args, "rU", encoding="utf-8")
-+                args = io.open(args, "r", encoding="utf-8")
-             except Preprocessor.Error:
-                 raise
-             except Exception:
-@@ -914,7 +914,7 @@ class Preprocessor:
- def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
-     pp = Preprocessor(defines=defines, marker=marker)
-     for f in includes:
--        with io.open(f, "rU", encoding="utf-8") as input:
-+        with io.open(f, "r", encoding="utf-8") as input:
-             pp.processFile(input=input, output=output)
-     return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 071daec..b59aabb 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
-     still occur, as well as diff capture if requested.
-     """
-
--    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
-+    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
-         BytesIO.__init__(self)
-         self.name = filename
-         assert type(capture_diff) == bool
-diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
-index 8150e72..001c497 100644
---- a/python/mozbuild/mozpack/files.py
-+++ b/python/mozbuild/mozpack/files.py
-@@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile):
-         pp = Preprocessor(defines=self.defines, marker=self.marker)
-         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
-
--        with _open(self.path, "rU") as input:
-+        with _open(self.path, "r") as input:
-             with _open(os.devnull, "w") as output:
-                 pp.processFile(input=input, output=output)
-
-@@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile):
-         pp = Preprocessor(defines=self.defines, marker=self.marker)
-         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
-
--        with _open(self.path, "rU") as input:
-+        with _open(self.path, "r") as input:
-             pp.processFile(input=input, output=dest, depfile=deps_out)
-
-         dest.close()
---
-2.36.1
-

Hacky-workaround-for-expected-string-or-bytes-like-object.patch

@@ -0,0 +1,28 @@
+From 588c3558c2cf338b45eaed34e23275bfbd517ff6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Tue, 11 Jul 2023 20:28:11 +0200
+Subject: [PATCH] Hacky workaround for expected string or bytes-like object,
+ got '_Py2Int'
+
+---
+ python/mozbuild/mozbuild/shellutil.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/python/mozbuild/mozbuild/shellutil.py b/python/mozbuild/mozbuild/shellutil.py
+index c47b19f..4fe6c3a 100644
+--- a/python/mozbuild/mozbuild/shellutil.py
++++ b/python/mozbuild/mozbuild/shellutil.py
+@@ -186,6 +186,10 @@ def _quote(s):
+     if type(s) == int:
+         return "%d" % s
+ 
++    if type(s) != str:
++        # looseversion objects leak here, this is ugly, I know, but gets the job done, so...
++        return str(s.__int__())
++
+     # Empty strings need to be quoted to have any significance
+     if s and not SHELL_QUOTE_RE.search(s) and not s.startswith("~"):
+         return s
+-- 
+2.41.0
+

Replace-distutils.LooseVersion-with-looseversion.LooseVersion.patch

@@ -0,0 +1,25 @@
+From 045b6698cd3da54d949ff228d601a6506ccf92bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Tue, 11 Jul 2023 18:35:00 +0200
+Subject: [PATCH] Replace distutils.LooseVersion with looseversion.LooseVersion
+
+---
+ python/mozbuild/mozbuild/configure/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/mozbuild/mozbuild/configure/util.py b/python/mozbuild/mozbuild/configure/util.py
+index 06ac247..e2ce7d5 100644
+--- a/python/mozbuild/mozbuild/configure/util.py
++++ b/python/mozbuild/mozbuild/configure/util.py
+@@ -14,7 +14,7 @@ import six
+ import sys
+ from collections import deque
+ from contextlib import contextmanager
+-from distutils.version import LooseVersion
++from looseversion import LooseVersion
+ 
+ 
+ def getpreferredencoding():
+-- 
+2.41.0
+

changelog

@@ -0,0 +1,32 @@
+* Mon Mar 13 2023 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.9.0-1
+- mozjs102-102.9.0 (fixes RHBZ#2177727)
+
+* Fri Feb 17 2023 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.8.0-1
+- mozjs102-102.8.0 (fixes RHBZ#2169721)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 102.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.7.0-1
+- mozjs102-102.7.0 (fixes RHBZ#2161250)
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 102.6.0-2
+- Rebuild for ICU 72
+
+* Mon Dec 12 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.6.0-1
+- mozjs102-102.6.0 (fixes RHBZ#2152654)
+
+* Tue Nov 15 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.5.0-1
+- mozjs102-102.5.0
+
+* Mon Oct 17 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.4.0-1
+- mozjs102-102.4.0 (fixes RHBZ#2135298)
+
+* Wed Sep 21 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.3.0-1
+- mozjs102-102.3.0 (fixes RHBZ#2127989)
+
+* Mon Aug 22 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.2.0-1
+- mozjs102-102.2.0
+
+* Wed Jul 27 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.1.0-1
+- Initial mozjs102 package based on mozjs91

firefox-112.0-commasplit.patch

@@ -0,0 +1,76 @@
+--- firefox-111.0.1/build/moz.configure/rust.configure	2023-03-21 06:16:03.000000000 -0700
++++ firefox-111.0.1/build/moz.configure/rust.configure.new	2023-04-05 08:57:29.403219120 -0700
+@@ -593,7 +593,7 @@
+ 
+ # ==============================================================
+ 
+-option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
++option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
+ set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
+ 
+ 
+--- firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py	2023-03-21 06:16:09.000000000 -0700
++++ firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py.new	2023-04-05 08:57:31.270193468 -0700
+@@ -191,6 +191,10 @@
+       to instantiate an option indirectly. Set this to a positive integer to
+       force the script to look into a deeper stack frame when inferring the
+       `category`.
++    - `comma_split` specifies whether the value string should be split on
++      commas. The default is True. Setting it False is necessary for things
++      like compiler flags which should be a single string that may contain
++      commas.
+     """
+ 
+     __slots__ = (
+@@ -205,6 +209,7 @@
+         "possible_origins",
+         "category",
+         "define_depth",
++        "comma_split",
+     )
+ 
+     def __init__(
+@@ -218,6 +223,7 @@
+         category=None,
+         help=None,
+         define_depth=0,
++        comma_split=True,
+     ):
+         if not name and not env:
+             raise InvalidOptionError(
+@@ -335,9 +341,10 @@
+         self.choices = choices
+         self.help = help
+         self.category = category or _infer_option_category(define_depth)
++        self.comma_split = comma_split
+ 
+     @staticmethod
+-    def split_option(option):
++    def split_option(option, comma_split=True):
+         """Split a flag or variable into a prefix, a name and values
+ 
+         Variables come in the form NAME=values (no prefix).
+@@ -350,7 +357,13 @@
+ 
+         elements = option.split("=", 1)
+         name = elements[0]
+-        values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
++        if len(elements) == 2:
++            if comma_split:
++                values = tuple(elements[1].split(","))
++            else:
++                values = (elements[1],)
++        else:
++            values = ()
+         if name.startswith("--"):
+             name = name[2:]
+             if not name.islower():
+@@ -426,7 +439,7 @@
+                 % (option, origin, ", ".join(self.possible_origins))
+             )
+ 
+-        prefix, name, values = self.split_option(option)
++        prefix, name, values = self.split_option(option, self.comma_split)
+         option = self._join_option(prefix, name)
+ 
+         assert name in (self.name, self.env)

known_failures.txt

@@ -1,16 +1,107 @@
+non262/Date/15.9.5.7.js
+non262/Date/reset-time-zone-cache-same-offset.js
+non262/Date/time-zone-path.js
+non262/Date/time-zones-historic.js
+non262/Date/time-zones-imported.js
+non262/Date/toString-localized-posix.js
+non262/Date/toString-localized.js
+non262/Intl/Array/toLocaleString-date.js
 non262/Intl/available-locales-resolved.js
 non262/Intl/available-locales-supported.js
-non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
+non262/Intl/Collator/collation.js
-non262/Intl/DateTimeFormat/tz-environment-variable.js
+non262/Intl/Date/toLocaleString_timeZone.js
+non262/Intl/Date/toLocaleTimeString_timeZone.js
 non262/Intl/DateTimeFormat/day-period-hour-cycle.js
-non262/Intl/DateTimeFormat/timeZone_version.js
+non262/Intl/DateTimeFormat/extended-time-zone-names.js
-non262/Date/toString-localized.js
+non262/Intl/DateTimeFormat/field-widths.js
-non262/Date/reset-time-zone-cache-same-offset.js
+non262/Intl/DateTimeFormat/format_timeZone.js
-non262/Date/time-zones-imported.js
+non262/Intl/DateTimeFormat/format.js
-non262/Date/time-zones-historic.js
+non262/Intl/DateTimeFormat/formatRange-hour-cycle.js
-non262/Date/toString-localized-posix.js
+non262/Intl/DateTimeFormat/formatToParts.js
-non262/Date/time-zone-path.js
+non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
-non262/Intl/supportedValuesOf-timeZones-canonical.js
+non262/Intl/DateTimeFormat/hourCycle.js
+non262/Intl/DateTimeFormat/implied-script-has-consistent-output.js
 non262/Intl/DateTimeFormat/timeZone_backward_links.js
-non262/Array/regress-157652.js
+non262/Intl/DateTimeFormat/timeZone_backzone.js
-non262/regress/regress-422348.js
+non262/Intl/DateTimeFormat/timeZone_version.js
+non262/Intl/DateTimeFormat/tz-environment-variable.js
+non262/Intl/DisplayNames/calendar.js
+non262/Intl/DisplayNames/dateTimeField.js
+non262/Intl/DisplayNames/language-dialect.js
+non262/Intl/ListFormat/conjunction-type.js
+non262/Intl/Locale/likely-subtags-generated.js
+non262/Intl/Locale/likely-subtags.js
+non262/Intl/NumberFormat/currency-narrow-symbol.js
+non262/Intl/NumberFormat/format.js
+non262/Intl/NumberFormat/notation-compact-long.js
+non262/Intl/supportedValuesOf-timeZones-canonical.js
+test262/built-ins/RegExp/property-escapes/generated/Alphabetic.js
+test262/built-ins/RegExp/property-escapes/generated/Assigned.js
+test262/built-ins/RegExp/property-escapes/generated/Case_Ignorable.js
+test262/built-ins/RegExp/property-escapes/generated/Cased.js
+test262/built-ins/RegExp/property-escapes/generated/Changes_When_NFKC_Casefolded.js
+test262/built-ins/RegExp/property-escapes/generated/Diacritic.js
+test262/built-ins/RegExp/property-escapes/generated/Emoji_Modifier_Base.js
+test262/built-ins/RegExp/property-escapes/generated/Emoji_Presentation.js
+test262/built-ins/RegExp/property-escapes/generated/Emoji.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Cased_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Decimal_Number.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Format.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Lowercase_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Mark.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Modifier_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Nonspacing_Mark.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Number.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Letter.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Number.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Punctuation.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Symbol.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Punctuation.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Spacing_Mark.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Symbol.js
+test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Unassigned.js
+test262/built-ins/RegExp/property-escapes/generated/Grapheme_Base.js
+test262/built-ins/RegExp/property-escapes/generated/Grapheme_Extend.js
+test262/built-ins/RegExp/property-escapes/generated/ID_Continue.js
+test262/built-ins/RegExp/property-escapes/generated/ID_Start.js
+test262/built-ins/RegExp/property-escapes/generated/Ideographic.js
+test262/built-ins/RegExp/property-escapes/generated/Lowercase.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Arabic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Common.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Cyrillic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Devanagari.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Egyptian_Hieroglyphs.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Han.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Hiragana.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Kannada.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Katakana.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Khojki.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Lao.js
+test262/built-ins/RegExp/property-escapes/generated/Script_-_Latin.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Arabic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Common.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Cyrillic.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Devanagari.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Egyptian_Hieroglyphs.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Han.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Hiragana.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Kannada.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Katakana.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Khojki.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Lao.js
+test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Latin.js
+test262/built-ins/RegExp/property-escapes/generated/Sentence_Terminal.js
+test262/built-ins/RegExp/property-escapes/generated/Soft_Dotted.js
+test262/built-ins/RegExp/property-escapes/generated/Terminal_Punctuation.js
+test262/built-ins/RegExp/property-escapes/generated/Unified_Ideograph.js
+test262/built-ins/RegExp/property-escapes/generated/XID_Continue.js
+test262/built-ins/RegExp/property-escapes/generated/XID_Start.js
+test262/intl402/DateTimeFormat/prototype/format/timedatestyle-en.js
+test262/intl402/DateTimeFormat/prototype/formatRange/en-US.js
+test262/intl402/DateTimeFormat/prototype/formatRange/fractionalSecondDigits.js
+test262/intl402/DateTimeFormat/prototype/formatRangeToParts/en-US.js
+test262/intl402/DateTimeFormat/prototype/formatRangeToParts/fractionalSecondDigits.js
+test262/intl402/Locale/constructor-non-iana-canon.js
+test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js

mozjs102.spec

@@ -4,7 +4,7 @@
 %global build_with_lto    1
 
 # Require tests to pass?
-%global require_tests     0
+%global require_tests     1
 
 %if 0%{?build_with_lto}
 # LTO is the default
@@ -18,8 +18,8 @@
 %endif
 
 Name:           mozjs%{major}
-Version:        102.4.0
+Version:        102.15.1
-Release:        1.0.riscv64%{?dist}
+Release:        %autorelease
 Summary:        SpiderMonkey JavaScript library
 
 License:        MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later
@@ -43,7 +43,15 @@ Patch13:        tests-Use-native-TemporaryDirectory.patch
 # Build fixes
 Patch14:        init_patch.patch
 Patch15:        remove-sloppy-m4-detection-from-bundled-autoconf.patch
-Patch16:        0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch
+
+# tentative patch for RUSTFLAGS parsing issue, taken from firefox package:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2184743
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1474486
+Patch16:        firefox-112.0-commasplit.patch
+
+Patch17:        Replace-distutils.LooseVersion-with-looseversion.LooseVersion.patch
+# This is ugly, I know, I know...
+Patch18:        Hacky-workaround-for-expected-string-or-bytes-like-object.patch
 
 # TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
 Patch20:        spidermonkey_checks_disable.patch
@@ -52,7 +60,9 @@ Patch20:        spidermonkey_checks_disable.patch
 Patch21:        0001-Skip-failing-tests-on-ppc64-and-s390x.patch
 
 BuildRequires:  cargo
+%if !0%{?rhel}
 BuildRequires:  ccache
+%endif
 BuildRequires:  clang-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -70,6 +80,7 @@ BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-looseversion
 BuildRequires:  python3-six
 BuildRequires:  readline-devel
 BuildRequires:  wget
@@ -94,6 +105,17 @@ developing applications that use %{name}.
 pushd ../..
 %autopatch -p1
 
+# Purge the bundled six library incompatible with Python 3.12
+rm third_party/python/six/six.py
+
+# Link the system six library (build tooling expects that)
+ln -s /usr/lib/python%{python3_version}/site-packages/six.py third_party/python/six/six.py
+
+# Set up looseversion
+mkdir third_party/python/looseversion
+ln -s /usr/lib/python%{python3_version}/site-packages/looseversion/__init__.py third_party/python/looseversion/looseversion.py
+echo "vendored:third_party/python/looseversion" >>  python/sites/mach.txt
+
 # Copy out the LICENSE file
 cp LICENSE js/src/
 
@@ -226,17 +248,4 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
 %{_includedir}/mozjs-%{major}/
 
 %changelog
-* Tue Oct 25 2022 David Abdurachmanov <davidlt@rivosinc.com> - 102.4.0-1.0.riscv64
+%autochangelog
-- Add support for riscv64
-
-* Mon Oct 17 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.4.0-1
-- mozjs102-102.4.0 (fixes RHBZ#2135298)
-
-* Wed Sep 21 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.3.0-1
-- mozjs102-102.3.0 (fixes RHBZ#2127989)
-
-* Mon Aug 22 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.2.0-1
-- mozjs102-102.2.0
-
-* Wed Jul 27 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 102.1.0-1
-- Initial mozjs102 package based on mozjs91

sources

@@ -1 +1 @@
-SHA512 (firefox-102.4.0esr.source.tar.xz) = 30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28
+SHA512 (firefox-102.15.1esr.source.tar.xz) = bdb66b4fb5622af3e60580a3bcd464d98ef13cb38d6ac6c9e5fc046e567a003cf080125d7748950c91c442fde5e8024c50c4180d2f551aa3528160a3c05ae187