From cdb6cd5a963dc891e8a5351affa6d0dbae20b756 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2022 08:57:40 +0000
Subject: import thunderbird-91.12.0-1.el8_6


---

diff --git a/.gitignore b/.gitignore
index dd9a6c5..e6e2812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 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.11.0.b2.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz
+SOURCES/thunderbird-91.12.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-91.12.0-20220725.tar.xz
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 42a3ade..fbdb5bb 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,5 +1,5 @@
 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
-98d87b884e38d175db17bc9ff414d0d42a091fa4 SOURCES/thunderbird-91.11.0.b2.processed-source.tar.xz
-66375e7d02209121c1ebfd07f96cb35e260d8885 SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz
+e200f143a28a7f7d5759a06ae11e52aec7a896a4 SOURCES/thunderbird-91.12.0.processed-source.tar.xz
+992480ecc2d5671a883758677d44d3ec6ff04d42 SOURCES/thunderbird-langpacks-91.12.0-20220725.tar.xz
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/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7
deleted file mode 100644
index c27d9d3..0000000
--- a/SOURCES/thunderbird-centos-default-prefs.js.el7
+++ /dev/null
@@ -1,36 +0,0 @@
-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", "CentOS");
-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);
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 49da977..b53839a 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -132,12 +132,11 @@ end}
 # thunderbird-91.9.0.b2.processed-source.tar.xz
 # When unset use processed source file name as is.
 #global buildnum .b2
-%global buildnum .b2
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        91.11.0
-Release:        2%{?dist}
+Version:        91.12.0
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -163,7 +162,7 @@ ExcludeArch:    aarch64 s390 ppc
 # 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}%{?buildnum}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20220725.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        get-calendar-langpacks.sh
@@ -175,7 +174,7 @@ Source21:       thunderbird.sh.in
 Source24:       mozilla-api-key
 Source27:       google-api-key
 Source28:       node-stdout-nonblocking-wrapper
-Source701:      thunderbird-centos-default-prefs.js.el7
+Source701:      thunderbird-redhat-default-prefs.js.rhel7
 
 Source403:      nss-3.67.0-7.el8_1.src.rpm
 Source401:      nss-setup-flags-env.inc
@@ -1132,8 +1131,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Thu Jun 30 2022 CentOS Sources <bugs@centos.org> - 91.11.0-2.el8.centos
-- Apply debranding changes
+* 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