$ git diff --patch-with-stat --summary 95ee0e80d9ce996ee9e3c58e79323e7276dd2554..befe684cf6b82dbda7bad6ffe4bd33a7851398f6

 .abf.yml                | 102 ++++++++++++++++++++++++------------------------
 build-python-3.11.patch |  28 +++++++++++++
 thunderbird.spec        |  11 +-----
 3 files changed, 81 insertions(+), 60 deletions(-)
 create mode 100644 build-python-3.11.patch

diff --git a/.abf.yml b/.abf.yml
index 59f0063..908ef5d 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,54 +1,54 @@
 sources:
-  ar.xpi: ab8bd903252cbed8c80ab475a02b5a78bd165bbd
-  ast.xpi: 41219f85fd3092462dfc588e634c7b7807444a49
-  be.xpi: b18f9e77a911ddb844c9fa2f2f77bb56447dfa35
-  bg.xpi: b1b8ef2363ce0627e51cb0f295f6b997f55685bd
-  br.xpi: 390679bfaa66769d0e645ad8625847e725ef4ada
-  ca.xpi: 1146d6993c7cf2936d748422ebd0c5413de609bc
+  ar.xpi: db73773e93ea923bcc4ed137db7b233e3d6f7111
+  ast.xpi: 700f60c59398f5fc1f18f74009e3e66780ccbc34
+  be.xpi: 7a7f4d9344fadb5ef87ac153939c2979b2a8fb24
+  bg.xpi: 044b4a40a63a4ed7a80b2c6e19657efdd313ab98
+  br.xpi: 515d121943e80204f278276724a9653ebc142a81
+  ca.xpi: 3d6b9b18061479059cbf92c0a08337b339073b9c
   cbindgen-vendor.tar.xz: e5b896e6edab51fa5bb92c7ca4b7304cd7ac7cdf
-  cs.xpi: bad86a1f1f80dc6f775085d3bafe4519e42e2632
-  da.xpi: fff4682d9a544e201721008a6078017972caaa71
-  de.xpi: af7646fc792b8f029bf6b3249d59cc39e2709893
-  el.xpi: 13137a06bf66e781dae40a60023ea4822e0924dd
-  en-GB.xpi: 07935f5051a718055545ec0c8f9210dec9061a4e
-  en-US.xpi: 10b4135820df93979f8bbcd3d6b006498eb3878e
-  es-AR.xpi: 43ec7158321b93cbda858743e374b24f86553d7e
-  es-ES.xpi: 66157754f3323151f2753470fc5008613ac6c18d
-  et.xpi: 819f6947a42ba02990fdd958f97ca8b6d42cb1a8
-  eu.xpi: 1ded78a0e3b1b55219d9b50c06d4dcca6d8d8179
-  fi.xpi: 56554c55ca76668df9640b89d8e821b5c2bdca12
-  fr.xpi: 09b4f656b8a2546729ba1ace1c22853a740b4b48
-  fy-NL.xpi: 6cd2918646c6026d0ca8d3da09213a3b570dbb6d
-  ga-IE.xpi: f083838bd5389911d6ad707887e0c50ba5006632
-  gd.xpi: 249b69b339b13bb5319c3d18d5693a67ce87ede5
-  gl.xpi: 2f4385a1e7cf3d4871f662dcbbb59c0bf39c06ed
-  he.xpi: adb8900b5240b9fe661cc4388fedb96a429cdcb2
-  hr.xpi: c094cc977067b17cbfbafe6ef347a7b40960e881
-  hu.xpi: 3b93d29c16e96f820bef1b48857d860af2be65a2
-  hy-AM.xpi: 2621b6e399b123b6c946a21192d04ec59755616b
-  id.xpi: 7f483c575ac14a6728649be5a055e45ce67d9438
-  is.xpi: 6aa9c1869574a45684ef679082e555e0fe1b9e74
-  it.xpi: 77b928d597ede32185b42ac192d2a6baa644a6c2
-  ja.xpi: 33d55a915cd51eacddcf30d7d47577576418a4a5
-  ko.xpi: de799fa4d9d98a44160e1b8adfdddf2475d9aa82
-  lt.xpi: 7530cc4ec8cd1e15e1885ed5251c7b47db846184
-  nb-NO.xpi: 7ad34efdb5e5a9d0653d523c858a1be2d6fef04b
-  nl.xpi: 67c6237c00e350654da7c297408b6b74a80bd780
-  nn-NO.xpi: d54fdf960dc4bb8cbd6c527294b1e2aaeb493adb
+  cs.xpi: 566cc95515d4506f2b021e88db65b8c04ed7264e
+  da.xpi: 94a70f324a895563b0fff9dd2d725e664cc4cd86
+  de.xpi: 5144a7c140ea84c548cb3ae4517eb373fc5f065c
+  el.xpi: 862178ca9a11ec2ef8bf4409332bc5d97cd66315
+  en-GB.xpi: f3774b50af3fc71cde4c906f51af441720acba2d
+  en-US.xpi: 075e0ad9979ce60242478ce456f7696653bc5f78
+  es-AR.xpi: a40b69045dd51da54f0a0c244a287732ee938c6f
+  es-ES.xpi: d8d119b7b4649e8a853e60b81d17e7e7ecac710d
+  et.xpi: 4c297e9d7745817d80d5a5914efdeedfa043207a
+  eu.xpi: 89b9f8f3ebd672429f53664e01daabe938627805
+  fi.xpi: 5fccf1a281d5ce06099f315b03309b338ffa571f
+  fr.xpi: f4340e6ce1011327ad07055020a4cd3071482ab2
+  fy-NL.xpi: 30bb3e3f3d25c908f0052f366a42d5c4eb4c7b62
+  ga-IE.xpi: 1b42d97be8262456b21c71ce869096f26a93a05b
+  gd.xpi: 82603196334c8a81a54cd74c12d03bc5fbe2d694
+  gl.xpi: e08badea1f67a056e9f452983b96e8123038f5ad
+  he.xpi: 73167928888fc305150ca238a34a1deaabda079a
+  hr.xpi: 00ec4527a773277a8db947260ae9b91907e5806e
+  hu.xpi: 48a6ccba8046f04af81971b5773ec2fd5552cb1a
+  hy-AM.xpi: fd7300c33ea5b8f5037f7cd8acf0c45bb5ebe671
+  id.xpi: 08c2555fa1b6be07098cf1bd7fae78cff8591d9d
+  is.xpi: abf63807b5f3e949d5fe5d9e35c61adbf948c25e
+  it.xpi: aa8f611a7c739b5402b0e4afd605a3faf0a954e2
+  ja.xpi: 5a5925d61542db810e1cc65ac9944cb86277152e
+  ko.xpi: d8db0ff7c9c5a8b680a0fa6d0724b2c1f8f43112
+  lt.xpi: f6ab91cf77542bdd5455cf38c5fba02f50acd4a5
+  nb-NO.xpi: 7053a9b757a236e4e10727a15eae7255d4a2b143
+  nl.xpi: 5f27809db364a642c37512d0ba441932ae474edd
+  nn-NO.xpi: 840ee1e67dcc1c9ffdf7b359fad54788109b83b4
   pa-IN.xpi: 6aee55e1bc6519ba0f38731ffb937123059e7add
-  pl.xpi: 2f4bd977ae397b872ea052d6df9e7e0efce04897
-  pt-BR.xpi: 9e158f468e52c89c28e034436f14c2ffa7a097f8
-  pt-PT.xpi: ad3c77bb1d46af783227a1b20733b70f1d3ba561
-  ro.xpi: 1e87bc83e942644b6ac729c98153f3e2d22ba60a
-  ru.xpi: 7677005d878e9075088b732404394f792a8a5692
-  sk.xpi: 0ffbee03627376e0dd09254b22ccdbf8b7c55bbf
-  sl.xpi: 086873deaddc791290b579777f2e92c8d912920c
-  sq.xpi: 152b889ca32b86b70237e12373823a365a92013b
-  sr.xpi: 87f5f2863a49f18364f2a4b0114e4568b493c50f
-  sv-SE.xpi: aff533718bfd88628dbe9980ae790babdbf39e56
-  thunderbird-102.1.0.source.tar.xz: 66f2f4372513dc6712b1853a2563c8cd519603e4
-  tr.xpi: 4b4bf065430a9278977fabdb69c7739c6aed45d5
-  uk.xpi: 4ba2654a00cab7a7ce675b456592d936d605b32c
-  vi.xpi: 376ba4d5e1cb5b1dd0320fac7e6c1efbc9c81135
-  zh-CN.xpi: 028cd4320d2df0a9c4edee22be50355a478074c1
-  zh-TW.xpi: c8700d003f985b7654e007f95b51620ac2525ccd
+  pl.xpi: 04aafc7183e099eaced793d9bf94eaec11d75c5a
+  pt-BR.xpi: df79e658230926951fc4e47753001651f78c63aa
+  pt-PT.xpi: 71fa7dfc77e97a3af6db5b56a9e1683f945cb825
+  ro.xpi: 99c9e4894f8560efa8c0c8c1daa1aff6e22183fc
+  ru.xpi: c1f5a7e5a8bd77f46f38fdbe0f1c4b9d641da5a7
+  sk.xpi: 6ed40fee4a34cd6c6e17aeb7b82c804ba10432c9
+  sl.xpi: ba913a2b81ab11b3232a91361c719dc200f39443
+  sq.xpi: bad67b4b55c89bcc201159493a0d917aa3824a82
+  sr.xpi: 012da909bff06020466ff06cdb67b83d7c68bab0
+  sv-SE.xpi: 246fa5cf86219396b608e983bb764fc0195e1c77
+  thunderbird-102.2.0.source.tar.xz: f6f725ecd40ff522a402c99513f675d9b9927b27
+  tr.xpi: e9286e6e679dc942ef919f07204f459ada4c15b1
+  uk.xpi: 11888329282858f50ce8f8bb7cb4e5fb33783299
+  vi.xpi: 74e8e96fa233495b2766d68623726a30b983b5d2
+  zh-CN.xpi: d336854a1b0925b74d2ff27c9a3bd91a9c47ad3e
+  zh-TW.xpi: 9fb979661b26bd2efd0b49fc628c9694f1a15b6e
diff --git a/build-python-3.11.patch b/build-python-3.11.patch
new file mode 100644
index 0000000..410a3da
--- /dev/null
+++ b/build-python-3.11.patch
@@ -0,0 +1,28 @@
+diff -up firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11 firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py
+--- firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11	2022-06-23 09:10:31.000000000 +0200
++++ firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py	2022-07-15 16:18:52.048351493 +0200
+@@ -1572,13 +1572,13 @@ class IDLParser(object):
+     t_ignore = " \t"
+ 
+     def t_multilinecomment(self, t):
+-        r"/\*(?s).*?\*/"
++        r"/\*(?s:.)*?\*/"
+         t.lexer.lineno += t.value.count("\n")
+         if t.value.startswith("/**"):
+             self._doccomments.append(t.value)
+ 
+     def t_singlelinecomment(self, t):
+-        r"(?m)//.*?$"
++        r"(?m://.*?$)"
+ 
+     def t_IID(self, t):
+         return t
+@@ -1591,7 +1591,7 @@ class IDLParser(object):
+         return t
+ 
+     def t_LCDATA(self, t):
+-        r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
++        r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)"
+         t.type = "CDATA"
+         t.value = t.lexer.lexmatch.group("cdata")
+         t.lexer.lineno += t.value.count("\n")
diff --git a/thunderbird.spec b/thunderbird.spec
index 6e55908..dea7928 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -38,11 +38,7 @@
 # currently enabled as updating all rust deps would take eons
 %global use_bundled_cbindgen  1
 
-%if %omvver > 4050000
-%define build_py python3.9
-%else
 %define build_py python3
-%endif
 
 # this seems fragile, so require the exact version or later (#58754)
 %define sqlite3_libname %{mklibname sqlite3_ 0}
@@ -211,7 +207,7 @@
 
 Summary:	Full-featured email, RSS, and newsgroup client
 Name:		thunderbird
-Version:	102.1.0
+Version:	102.2.0
 Release:	1
 License:	MPL
 Group:		Networking/Mail
@@ -249,6 +245,7 @@ Source401:	thunderbird-l10n-template.in
 # Build patches
 #
 Patch10:	firefox-98.0-python-3.11.patch
+Patch11:	build-python-3.11.patch
 # Fedora patches (Patch100+)
 #
 # (currently none required)
@@ -270,11 +267,7 @@ BuildRequires:	jpeg-devel
 BuildRequires:	nss-static-devel
 BuildRequires:	glibc-static-devel
 BuildRequires:	icu-devel
-%if %omvver <= 4050000
 BuildRequires:  pkgconfig(python3)
-%else
-BuildRequires:  pkgconfig(python-3.9)
-%endif
 BuildRequires:	pkgconfig(alsa)
 BuildRequires:	pkgconfig(dbus-glib-1)
 BuildRequires:	pkgconfig(fontconfig)