From 4bc6cdd8e574f22f240df331e1b6c4f2f819f2ab Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 07 2020 07:41:44 +0000
Subject: import thunderbird-68.12.0-1.el7_8


---

diff --git a/.gitignore b/.gitignore
index d139924..a987494 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,9 @@ SOURCES/Python-3.6.8.tar.xz
 SOURCES/cbindgen-vendor.tar.xz
 SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-SOURCES/lightning-langpacks-68.11.0.tar.xz
+SOURCES/lightning-langpacks-68.12.0.tar.xz
 SOURCES/nodejs-8.11.4-1.3.fc27.src.rpm
 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-SOURCES/thunderbird-68.11.0.source.tar.xz
-SOURCES/thunderbird-langpacks-68.11.0-20200804.tar.xz
+SOURCES/thunderbird-68.12.0.source.tar.xz
+SOURCES/thunderbird-langpacks-68.12.0-20200902.tar.xz
 SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index fa1d651..a5ad252 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -3,9 +3,9 @@ ee55acedef049268307633cbc9c7ff0610d1244f SOURCES/Python-3.6.8.tar.xz
 e86c38c48960b95353503b78e1de9ddca1ed34d7 SOURCES/cbindgen-vendor.tar.xz
 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-8476c6e7c27eba1836581ad86fc504e4853f077b SOURCES/lightning-langpacks-68.11.0.tar.xz
+cbfcc6f4f69d50daed63fa044a062cbd09b896a9 SOURCES/lightning-langpacks-68.12.0.tar.xz
 4f8d3bf2483d95261ff90742ecec82d6a899eca3 SOURCES/nodejs-8.11.4-1.3.fc27.src.rpm
 a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-7b5764677819ca27af51b5e9b4be0d8180a8bfed SOURCES/thunderbird-68.11.0.source.tar.xz
-627fbe742a97fcfa7b4b08c8e9688b95a043bcba SOURCES/thunderbird-langpacks-68.11.0-20200804.tar.xz
+7ffe345515453434accf0cfa21c8a831ff676d10 SOURCES/thunderbird-68.12.0.source.tar.xz
+6fa9366d357a6800b30c7c225876a530fc3a0711 SOURCES/thunderbird-langpacks-68.12.0-20200902.tar.xz
 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
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/no-rust-lto.patch b/SOURCES/no-rust-lto.patch
deleted file mode 100644
index 227bb9c..0000000
--- a/SOURCES/no-rust-lto.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up thunderbird-68.11.0/config/makefiles/rust.mk.no-rust-lto thunderbird-68.11.0/config/makefiles/rust.mk
---- thunderbird-68.11.0/config/makefiles/rust.mk.no-rust-lto	2020-08-04 12:01:08.172071480 +0200
-+++ thunderbird-68.11.0/config/makefiles/rust.mk	2020-08-04 12:26:25.927808414 +0200
-@@ -50,8 +50,8 @@ ifndef MOZ_DEBUG_RUST
- # Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
- # for newer ones that support it. Combining the latter with -Clto works, so
- # set both everywhere.
--cargo_rustc_flags += -C lto
--export CARGO_PROFILE_RELEASE_LTO=true
-+#cargo_rustc_flags += -C lto
-+#export CARGO_PROFILE_RELEASE_LTO=true
- endif
- endif
- 
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index c104e7a..b3f896c 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -123,7 +123,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        68.11.0
+Version:        68.12.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -139,7 +139,7 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20200804.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20200902.tar.xz
 # Locales for lightning
 Source2:        lightning-langpacks-%{version}.tar.xz
 %endif
@@ -177,7 +177,6 @@ Patch1001:      build-ppc64le-inline.patch
 Patch1002:      python-2.7-gcc8-fix.patch
 Patch1003:      python-missing-utimensat.patch
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
-Patch1:         no-rust-lto.patch
 Patch2:         rust-network-check.patch
 Patch4:         build-mozconfig-fix.patch
 Patch6:         build-nss-version.patch
@@ -379,7 +378,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %setup -q -n %{tarballdir}
 
 # Firefox patches
-%patch1 -p1 -b .no-rust-lto
 %patch2 -p1 -b .rust-network-check
 %patch7 -p1 -b .debugedits-error
 %ifarch %{ix86} %{arm} ppc
@@ -791,7 +789,7 @@ export MOZ_DEBUG_FLAGS=" "
 %ifarch s390 %{arm} ppc aarch64 i686 x86_64
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
-%ifarch %{arm}
+%ifarch %{arm} i686
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 %ifarch s390
@@ -1109,6 +1107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Wed Sep 02 2020 Jan Horak <jhorak@redhat.com> - 68.12.0-1
+- Update to 68.12.0 build1
+
 * Tue Aug 04 2020 Jan Horak <jhorak@redhat.com> - 68.11.0-1
 - Update to 68.11.0 build1