import thunderbird-91.13.0-1.el9

.gitignore

 SOURCES/cbindgen-vendor.tar.xz
 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-SOURCES/thunderbird-91.7.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.7.0-20220308.tar.xz
+SOURCES/thunderbird-91.13.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-91.13.0-20220819.tar.xz

.thunderbird.metadata

 c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
 b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
-0d9dea815661a0ad101d2fd758be855a542f2797 SOURCES/thunderbird-91.7.0.processed-source.tar.xz
-eab467b27d7ff768518cbb6ee38cc8b1ab793920 SOURCES/thunderbird-langpacks-91.7.0-20220308.tar.xz
+4def481a0e18a393bc756888f3da179187272fcf SOURCES/thunderbird-91.13.0.processed-source.tar.xz
+7a3d28c5d6f3266cacad2e42ca9c2cc9b90dd27e SOURCES/thunderbird-langpacks-91.13.0-20220819.tar.xz

SOURCES/thunderbird-redhat-default-prefs.js.rhel7

+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+/* Allow users to set custom colors*/
+/* pref("browser.display.use_system_colors",   true);*/
+pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+
+/* Disable global indexing by default*/
+pref("mailnews.database.global.indexer.enabled", false);
+
+/* Do not switch to Smart Folders after upgrade to 3.0b4 */
+pref("mail.folder.views.version", "1");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.autoDisableScopes", 0);
+
+/* For rhbz#1024232 */
+pref("ui.SpellCheckerUnderlineStyle",       1);
+
+/* Workaround for rhbz#1753011 */
+pref("spellchecker.dictionary_path", "/usr/share/myspell");
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit",      false);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+/* Disable telemetry */
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);

SPECS/thunderbird.spec

@@ -19,7 +19,7 @@ function dist_to_rhel_minor(str, start)
   end
   match = string.match(str, ".el8")
   if match then
-     return 6
+     return 7
   end
 end}
 
@@ -125,11 +125,18 @@ end}
 
 %global official_branding       1
 %global build_langpacks         1
+
+# Workaround the dreaded "upstream source file changed content" rpmdiff failure that only secalert can waive.
+# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
+# thunderbird-91.9.0.b2.processed-source.tar.xz
+# When unset use processed source file name as is.
+#global buildnum .b2
+
 %bcond_with rlplus
 Summary: Mozilla Thunderbird mail/newsgroup client
 Name: thunderbird
-Version: 91.7.0
-Release: 2%{?dist}%{?with_rlplus:.plus}
+Version: 91.13.0
+Release: 1%{?dist}%{?with_rlplus:.plus}
 URL: http://www.mozilla.org/projects/thunderbird/
 License: MPLv1.1 or GPLv2+ or LGPLv2+
 Group: Applications/Internet
@@ -149,9 +156,9 @@ ExcludeArch: s390 ppc
 # The official tarball has to be always processed by the process-official-tarball
 # script.
 # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz
-Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
+Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220308.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220819.tar.xz
 %endif
 Source2: cbindgen-vendor.tar.xz
 Source3: get-calendar-langpacks.sh
@@ -163,7 +170,7 @@ Source21: thunderbird.sh.in
 Source24: mozilla-api-key
 Source27: google-api-key
 Source28: node-stdout-nonblocking-wrapper
-Source701: thunderbird-rocky-default-prefs.js
+Source701: thunderbird-redhat-default-prefs.js.rhel7
 
 Source403: nss-3.67.0-7.el8_1.src.rpm
 Source401: nss-setup-flags-env.inc
@@ -172,7 +179,7 @@ Source402: nspr-4.32.0-1.el8_1.src.rpm
 # Build patches
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
 Patch1001: build-ppc64le-inline.patch
-Patch1003: python-missing-utimensat.patch
+#Patch1003:      python-missing-utimensat.patch
 Patch1008: build-rhel7-nasm-dwarf.patch
 Patch1009: build-debuginfo-fix.patch
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
@@ -183,9 +190,7 @@ Patch6: build-nss-version.patch
 Patch215: firefox-enable-addons.patch
 Patch219: rhbz-1173156.patch
 Patch224: mozilla-1170092.patch
-%if %{without rlplus}
 Patch237: disable-openpgp-in-thunderbird.patch
-%endif
 
 # Upstream patches
 
@@ -444,9 +449,7 @@ echo "use_rustts            %{?use_rustts}"
 %patch516 -p1 -b .expat-CVE-2022-25235
 %patch517 -p1 -b .expat-CVE-2022-25236
 %patch518 -p1 -b .expat-CVE-2022-25315
-%if %{without rlplus}
 %patch237 -p1 -b .disable-openpgp-in-thunderbird
-%endif
 
 
 %patch1001 -p1 -b .ppc64le-inline
@@ -1025,9 +1028,7 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
 
 
 # Removing librnp.so - we cannot deliver that in RHELs
-%if %{without rlplus}
 %{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
-%endif
 
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@@ -1114,10 +1115,40 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Tue May 10 2022 Release Engineering <releng@rockylinux.org> - 91.7.0-2%{?with_rlplus:.plus}
+* Tue Sep 27 2022 Release Engineering <releng@rockylinux.org> - 91.13.0-1%{?with_rlplus:.plus}
 - Add Rocky Linux debranding
 - Add rlplus conditional
 
+* Fri Aug 19 2022 Eike Rathke <erack@redhat.com> - 91.13.0-1
+- Update to 91.13.0 build1
+
+* Mon Jul 25 2022 Eike Rathke <erack@redhat.com> - 91.12.0-1
+- Update to 91.12.0 build1
+
+* Tue Jun 28 2022 Eike Rathke <erack@redhat.com> - 91.11.0-2
+- Update to 91.11.0 build2
+
+* Thu Jun 23 2022 Eike Rathke <erack@redhat.com> - 91.11.0-1
+- Update to 91.11.0 build1
+
+* Mon May 30 2022 Eike Rathke <erack@redhat.com> - 91.10.0-1
+- Update to 91.10.0 build1
+
+* Mon May 23 2022 Jan Horak <jhorak@redhat.com> - 91.9.1-1
+- Update to 91.9.1 build1
+
+* Tue May 03 2022 Eike Rathke <erack@redhat.com> - 91.9.0-3
+- Update to 91.9.0 build3
+
+* Mon May 02 2022 Eike Rathke <erack@redhat.com> - 91.9.0-2
+- Update to 91.9.0 build2
+
+* Thu Apr 28 2022 Eike Rathke <erack@redhat.com> - 91.9.0-1
+- Update to 91.9.0
+
+* Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1
+- Update to 91.8.0
+
 * Tue Mar 08 2022 Eike Rathke <erack@redhat.com> - 91.7.0-2
 - Update to 91.7.0 build2