X-Git-Url: http://git.pld-linux.org/?p=packages%2Fthunderbird.git;a=blobdiff_plain;f=thunderbird.spec;h=8bda657a10082ce92c753773f057cbc4e8301821;hp=aac379655dbb015e7b4ae2fc38f3d00c9bfa567f;hb=ee36b7a;hpb=64d629992196fc280ced51d80a07da47f7ef6ad7

diff --git a/thunderbird.spec b/thunderbird.spec
index aac3796..8bda657 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -4,7 +4,6 @@
 #
 # Conditional builds
 %bcond_with	tests		# enable tests (whatever they check)
-%bcond_without	ldap		# disable e-mail address lookups in LDAP directories
 %bcond_without	lightning	# disable Sunbird/Lightning calendar
 %bcond_without	official	# official Thunderbird branding
 %bcond_with	crashreporter	# report crashes to crash-stats.mozilla.com
@@ -13,8 +12,8 @@
 %bcond_with	shared_js	# shared libmozjs library [broken]
 %bcond_without	system_icu	# build without system ICU
 %bcond_with	system_cairo	# build with system cairo (not supported in 60.0)
-%bcond_with	system_libvpx	# build with system libvpx (60.7.0 does not build with libvpx 1.8)
-%bcond_with	clang		# build using Clang/LLVM
+%bcond_without	system_libvpx	# build with system libvpx
+%bcond_without	clang		# build using Clang/LLVM
 %bcond_with	lowmem		# lower memory requirements
 
 # UPDATING TRANSLATIONS:
@@ -22,7 +21,7 @@
 rm -vf *.xpi
 ./builder -g
 V=31.4.0
-U=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$V/linux-i686/
+U=https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$V/linux-i686/
 curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p'
 %endif
 
@@ -36,184 +35,199 @@ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p'
 %define		with_lowmem	1
 %endif
 
-%define		nspr_ver	4.21
-%define		nss_ver		3.44.4
-
-# The actual sqlite version (see RHBZ#480989):
-%define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
+%define		nspr_ver	4.25
+%define		nss_ver		3.53.1
 
 Summary:	Thunderbird - email client
 Summary(pl.UTF-8):	Thunderbird - klient poczty
 Name:		thunderbird
-Version:	68.10.0
+Version:	78.11.0
 Release:	1
 License:	MPL v2.0
 Group:		X11/Applications/Mail
-Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/%{name}-%{version}.source.tar.xz
-# Source0-md5:	62ea95edc0e0c0bd90c6a3307ebe2aac
+Source0:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/%{name}-%{version}.source.tar.xz
+# Source0-md5:	fdab4c936a7b61378365a3bddda30f32
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
-Source100:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ar.xpi
-# Source100-md5:	118fbd5d93c0e9f02c0b31ea3e585c5d
-Source101:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ast.xpi
-# Source101-md5:	7ae61d51439a95e01bea0b96ce01d91b
-Source102:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/be.xpi
-# Source102-md5:	1f532fe311382311a3fefb973cb119f8
-Source103:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/bg.xpi
-# Source103-md5:	b72f6d4a642320258c7811adda02497d
-Source104:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/br.xpi
-# Source104-md5:	e6ca8aa7d10c6056d9cff9011e450b51
-Source105:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ca.xpi
-# Source105-md5:	f26cff8102423ea1a166991ce9687395
-Source106:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cs.xpi
-# Source106-md5:	c794c8e0327128c11e0195f4a2eceb5f
-Source107:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cy.xpi
-# Source107-md5:	d5d8574148f2e4f0bb224791fbd68a85
-Source108:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/da.xpi
-# Source108-md5:	8c7f52b4e021f5c36444efaf383a8fbb
-Source109:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/de.xpi
-# Source109-md5:	a0a142963bf5398366e36eee3f6c083c
-Source110:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/dsb.xpi
-# Source110-md5:	846759f7c07bc2f389ef0c3c04f2931c
-Source111:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/el.xpi
-# Source111-md5:	0235010648a2f556030a9d98ad14a9ae
-Source112:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-GB.xpi
-# Source112-md5:	7cc3b33dc623d7c0264cbce948a598b0
-Source113:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-US.xpi
-# Source113-md5:	48dbeac337d10d5f16834206c5b2d167
-Source114:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-AR.xpi
-# Source114-md5:	1a6b7922f6e7e2d409e35477bb42d8e6
-Source115:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-ES.xpi
-# Source115-md5:	0f1afb00eae407a543a62adb7adc6cc7
-Source116:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/et.xpi
-# Source116-md5:	40d34b85dd8035669b6c5ce38a2fa51f
-Source117:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/eu.xpi
-# Source117-md5:	49281d722aa066698391499800a46673
-Source118:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fi.xpi
-# Source118-md5:	450d0eac20d93cbb2d651f3e4d98cfbe
-Source119:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fr.xpi
-# Source119-md5:	f7a184cd3d71659a904d56ae10b0ce77
-Source120:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fy-NL.xpi
-# Source120-md5:	a3e0ebe751e1ba0671e2ee7ff63b2a5f
-Source121:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ga-IE.xpi
-# Source121-md5:	6ec19d4888c53f7b6be32f68b6488b63
-Source122:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gd.xpi
-# Source122-md5:	527cc616203983adcdb0b964f49ab3c0
-Source123:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gl.xpi
-# Source123-md5:	5fcba685d568891a6e64ee34e5538bee
-Source124:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/he.xpi
-# Source124-md5:	d300cd6b595a74b1b64794fd943dba87
-Source125:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hr.xpi
-# Source125-md5:	b0e85c552ca61774ac888fda8af35a52
-Source126:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hsb.xpi
-# Source126-md5:	1533dc046f7a18077f42e0269e9abc29
-Source127:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hu.xpi
-# Source127-md5:	c009e6f3dd0fee6f3f772e1d3e911279
-Source128:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hy-AM.xpi
-# Source128-md5:	6dd9e5d7caa7997d061f638317b50499
-Source129:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/id.xpi
-# Source129-md5:	0754d40956ce41926892d7376c85656f
-Source130:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/is.xpi
-# Source130-md5:	45d9759e48e6a00c3210e984f155d434
-Source131:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/it.xpi
-# Source131-md5:	db984a7c991557d5823b7460af97dcc7
-Source132:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ja.xpi
-# Source132-md5:	d8b5e3492f92371154ad5b7b0da2a254
-Source133:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kab.xpi
-# Source133-md5:	d1cbd5e2c29bc43c9a78948be5a8f1a6
-Source134:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kk.xpi
-# Source134-md5:	1e865dc62184a93d96a4251ae3a71502
-Source135:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ko.xpi
-# Source135-md5:	151e6d23ba4d8300999e522b05bc608b
-Source136:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/lt.xpi
-# Source136-md5:	b69e5094da8554ad201dec973ddcf0ba
-Source137:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ms.xpi
-# Source137-md5:	7cba6d4b7779cac279af733fbaacb0f8
-Source138:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nb-NO.xpi
-# Source138-md5:	9c646d7eb23992944da88f8b1a12e943
-Source139:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nl.xpi
-# Source139-md5:	1007dfd318ce739dff09907684165024
-Source140:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nn-NO.xpi
-# Source140-md5:	720ca21eca6bf39400e46078d06465d2
-Source141:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pl.xpi
-# Source141-md5:	13b61495009ec4c1e2d84370b8c0c6b4
-Source142:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-BR.xpi
-# Source142-md5:	966248d90ac488a48f95e23c095b304c
-Source143:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-PT.xpi
-# Source143-md5:	094bf7eccce6af1b560266712f683c2a
-Source144:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/rm.xpi
-# Source144-md5:	b7c1ca944327ac06b12dbb39cadf0d23
-Source145:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ro.xpi
-# Source145-md5:	812ff1820ec63e7f7d69479a197e5736
-Source146:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ru.xpi
-# Source146-md5:	1251d9fdaf87f5e5e630be236538951f
-Source147:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/si.xpi
-# Source147-md5:	315b320ad8d82cd088717ad8596213c4
-Source148:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sk.xpi
-# Source148-md5:	6bc29bdade03c7fc64faa5b61d1a8c48
-Source149:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sl.xpi
-# Source149-md5:	fbcb70fdc5dad53a092d98190ad94f21
-Source150:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sq.xpi
-# Source150-md5:	d4bb2c940f1beeb7448f810e34c44e10
-Source151:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sr.xpi
-# Source151-md5:	2afb6aba183daae059c1de47e64e765f
-Source152:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sv-SE.xpi
-# Source152-md5:	7ffc4446fe13e940836505fd65fcebc0
-Source153:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/tr.xpi
-# Source153-md5:	e07cb1dc4904ae15b7c3e44de1d73ee8
-Source154:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/uk.xpi
-# Source154-md5:	200b8047f8f35cfad639587f0f3baa1d
-Source155:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/vi.xpi
-# Source155-md5:	f10e1141ab9c949d3ef4646b05c3fb67
-Source156:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-CN.xpi
-# Source156-md5:	88f39549548cdffff3732fb74b6569e7
-Source157:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-TW.xpi
-# Source157-md5:	63fe0cf8b4baf78a0da9b2e8124dfd96
+Source100:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/af.xpi
+# Source100-md5:	b7e58557756d2d721e6e3c2b2061ec6e
+Source101:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ar.xpi
+# Source101-md5:	a061cc416094725171a57e45ccfab939
+Source102:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ast.xpi
+# Source102-md5:	673929c00573c1e846e42eebcb79ec73
+Source103:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/be.xpi
+# Source103-md5:	9f681c33cb3176291cfc091e0ba82af9
+Source104:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/bg.xpi
+# Source104-md5:	d3917c3469ff2815b36d8b36aca77549
+Source105:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/br.xpi
+# Source105-md5:	ed8c7187ef36cc4a3c38c750a658af22
+Source106:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ca.xpi
+# Source106-md5:	a750d71b850435e5bc5815e286e7502c
+Source107:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/cak.xpi
+# Source107-md5:	7cfb7e6209e481ffc0936a8b74b7f1fe
+Source108:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/cs.xpi
+# Source108-md5:	1e1a00f8f7f9d2ad18e05e0a06fa2f8a
+Source109:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/cy.xpi
+# Source109-md5:	74df8eb00c15e465a77f597fc57366f7
+Source110:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/da.xpi
+# Source110-md5:	701a9b5d22e43759ce5d606a33ab19cd
+Source111:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/de.xpi
+# Source111-md5:	3173bf33d484c77f495c7ad308e51a62
+Source112:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/dsb.xpi
+# Source112-md5:	8b0bdb9500369732f92ac68749d529bb
+Source113:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/el.xpi
+# Source113-md5:	5679840e8acbf8d3e5f9a47bb20829fc
+Source114:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/en-CA.xpi
+# Source114-md5:	57768de1a28e7fd530c9d7ff94a9342f
+Source115:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/en-GB.xpi
+# Source115-md5:	efe24a9848f7eaf6cdad359f292aa81f
+Source116:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/en-US.xpi
+# Source116-md5:	5556d68eef88960d8fca4bf929c7c177
+Source117:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/es-AR.xpi
+# Source117-md5:	48830c5cfac49a4fa90fc570cdcb380a
+Source118:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/es-ES.xpi
+# Source118-md5:	cd1c41643b67b228a58e2f366fe485a1
+Source119:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/et.xpi
+# Source119-md5:	f89598e1fbfcc301be725a2f0fc290b6
+Source120:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/eu.xpi
+# Source120-md5:	4e0397c0800505b4d727e8ce2f89f1d4
+Source121:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fa.xpi
+# Source121-md5:	d5a808ea08ed152f23c3d0f4f44c3476
+Source122:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fi.xpi
+# Source122-md5:	7de66b54ce0020037d2f45e8a8a73563
+Source123:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fr.xpi
+# Source123-md5:	6e2b3cca272b71d466e66e5e0dd1f903
+Source124:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fy-NL.xpi
+# Source124-md5:	2b545a609bb79ac8e12f87b09f7bdac5
+Source125:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ga-IE.xpi
+# Source125-md5:	590b40104a2b2600a29502cecfe66318
+Source126:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/gd.xpi
+# Source126-md5:	a4f0a8ffa7ff4b7e89c0b7998eae0cf7
+Source127:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/gl.xpi
+# Source127-md5:	2a46f7a77280cdfa1f23585e7c368e1d
+Source128:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/he.xpi
+# Source128-md5:	33a9b05a8401e87bc4fbf874b5f4e939
+Source129:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hr.xpi
+# Source129-md5:	2dee5111e69c68a650f73d994b9acbd2
+Source130:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hsb.xpi
+# Source130-md5:	3b1d375a45d40f4868544abb1d8ba159
+Source131:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hu.xpi
+# Source131-md5:	ef819467df077efa4726646c4c1b0e4e
+Source132:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hy-AM.xpi
+# Source132-md5:	9aec46f9c3fdca16d4c97246408ec452
+Source133:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/id.xpi
+# Source133-md5:	5548a7c1ad2a472031a22adcc755b499
+Source134:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/is.xpi
+# Source134-md5:	ac657373f26a966a25225045498749a6
+Source135:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/it.xpi
+# Source135-md5:	5a4ca23095cc0c590d82709c86f6190f
+Source136:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ja.xpi
+# Source136-md5:	7066b2c655f6b216a0f53327abc03af4
+Source137:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ka.xpi
+# Source137-md5:	86ff773f8786965fb12f76394e8f4121
+Source138:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/kab.xpi
+# Source138-md5:	ce02390c190dfe6230c45ebaa09c39e3
+Source139:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/kk.xpi
+# Source139-md5:	bebbf6be8a35fb5c425a05d2abf480df
+Source140:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ko.xpi
+# Source140-md5:	aa83a4df205def81341759d9015b9d28
+Source141:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/lt.xpi
+# Source141-md5:	c7bd205bd5a4b5655e1458d0bf3d156d
+Source142:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ms.xpi
+# Source142-md5:	50c0eb8e7c6b8dcf3b42569f33579889
+Source143:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/nb-NO.xpi
+# Source143-md5:	7421319a5e8f314fd72abbbb6d85e4f9
+Source144:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/nl.xpi
+# Source144-md5:	72c302802fa24fd434a3e52f1d5f521a
+Source145:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/nn-NO.xpi
+# Source145-md5:	df5e8219621a1fb5ed915cddbec67277
+Source146:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pa-IN.xpi
+# Source146-md5:	cf322cca6388e48e2fd42e01e1b3dfdd
+Source147:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pl.xpi
+# Source147-md5:	dfa2f68fd391d2dc086255136d8ddfab
+Source148:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pt-BR.xpi
+# Source148-md5:	3d4ff0e38fe212ff506a7f9af1bb0087
+Source149:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pt-PT.xpi
+# Source149-md5:	8150cd42ba811540e3af5413ca34eff6
+Source150:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/rm.xpi
+# Source150-md5:	ee4dad3f77889c37ee158629e711e6ef
+Source151:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ro.xpi
+# Source151-md5:	7504f1acb4ee7c3a25bfbab83a8ae0ad
+Source152:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ru.xpi
+# Source152-md5:	e2e247ea66149a3c0d921b593017151d
+Source153:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/si.xpi
+# Source153-md5:	b21cef4fffbcd97af1ead58b25470322
+Source154:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sk.xpi
+# Source154-md5:	9365b43e31a57fd9c90a57c9299a366e
+Source155:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sl.xpi
+# Source155-md5:	02a6cc686b132b9c9b3ea7b7c8e2c997
+Source156:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sq.xpi
+# Source156-md5:	020a2af1600e5232b5020afbf7ec633f
+Source157:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sr.xpi
+# Source157-md5:	d6abcd5a5d8bc1509751af4b7cb1de0d
+Source158:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sv-SE.xpi
+# Source158-md5:	51e2aa531e8cb4ec9a5f51f5bdd0c9aa
+Source159:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/th.xpi
+# Source159-md5:	1b165bcea8e0ef7403a443558673d232
+Source160:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/tr.xpi
+# Source160-md5:	8b08b4f1cda3ad247aee948844c1f182
+Source161:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/uk.xpi
+# Source161-md5:	7b9d7c0257157d33828676f34dcf2c8f
+Source162:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/uz.xpi
+# Source162-md5:	d4eefd598026d569c2a5490ee4d79f0e
+Source163:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/vi.xpi
+# Source163-md5:	d1173535887b2b5ab2754eb474fc12ba
+Source164:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/zh-CN.xpi
+# Source164-md5:	ff22d2167204978f5d933af1147562cd
+Source165:	https://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/zh-TW.xpi
+# Source165-md5:	90174abe10f0cdfbaa3eaf33f8d4bc9f
 Patch0:		prefs.patch
 Patch1:		no-subshell.patch
 Patch2:		enable-addons.patch
-Patch3:		format.patch
+Patch3:		%{name}-system-virtualenv.patch
 URL:		http://www.mozilla.org/projects/thunderbird/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf2_13 >= 2.13
 %{?with_gold:BuildRequires:	binutils >= 3:2.20.51.0.7}
-BuildRequires:	bzip2-devel
 %{?with_system_cairo:BuildRequires:	cairo-devel >= 1.10.2-5}
 BuildRequires:	cargo
 %{?with_clang:BuildRequires:	clang}
 BuildRequires:	clang-devel
+BuildRequires:	dbus-devel >= 0.60
 BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	fontconfig-devel >= 2.7.0
 BuildRequires:	freetype-devel >= 1:2.1.8
 BuildRequires:	glib2-devel >= 1:2.22
-BuildRequires:	gtk+3-devel >= 3.4.0
+BuildRequires:	gtk+3-devel >= 3.14.0
 BuildRequires:	libatomic-devel
+BuildRequires:	libdrm-devel >= 2.4
 BuildRequires:	libevent-devel
 BuildRequires:	libffi-devel > 3.0.9
-%{?with_system_icu:BuildRequires:	libicu-devel >= 63.1}
+%{?with_system_icu:BuildRequires:	libicu-devel >= 67.1}
 BuildRequires:	libiw-devel
 # requires libjpeg-turbo implementing at least libjpeg 6b API
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libjpeg-turbo-devel
-BuildRequires:	libpng-devel >= 2:1.6.25
-BuildRequires:	libstdc++-devel
-%{?with_system_libvpx:BuildRequires:	libvpx-devel >= 1.5.0}
+BuildRequires:	libpng-devel >= 2:1.6.35
+BuildRequires:	libstdc++-devel >= 6:7
+BuildRequires:	libwebp-devel >= 1.0.2
+%{?with_system_libvpx:BuildRequires:	libvpx-devel >= 1.8.0}
 BuildRequires:	llvm-devel
 BuildRequires:	mozldap-devel
-BuildRequires:	nodejs >= 8.11
+BuildRequires:	nodejs >= 10.21.0
 BuildRequires:	nspr-devel >= 1:%{nspr_ver}
 BuildRequires:	nss-devel >= 1:%{nss_ver}
 BuildRequires:	pango-devel >= 1:1.22.0
 BuildRequires:	perl-base >= 1:5.6
 BuildRequires:	pixman-devel >= 0.19.2
 BuildRequires:	pkgconfig
-BuildRequires:	python >= 1:2.7
-BuildRequires:	python-virtualenv
-BuildRequires:	rust >= 1.34.0
-BuildRequires:	rust-cbindgen >= 0.8.2
+BuildRequires:	python3 >= 1:3.8.5-3
+BuildRequires:	python3-virtualenv
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rust >= 1.41.0
+BuildRequires:	rust-cbindgen >= 0.14.1
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.28.0
-BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	virtualenv
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXcomposite-devel
@@ -221,6 +235,8 @@ BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.4.1
+BuildRequires:	xz
 %ifarch %{ix86} %{x8664}
 BuildRequires:	yasm >= 1.0.1
 %endif
@@ -229,20 +245,26 @@ BuildRequires:	zlib-devel >= 1.2.3
 Requires(post):	mktemp >= 1.5-18
 %{?with_system_cairo:Requires:	cairo >= 1.10.2-5}
 Requires:	dbus-glib >= 0.60
+Requires:	fontconfig >= 2.7.0
 Requires:	glib2 >= 1:2.22
-Requires:	gtk+3 >= 3.4.0
-Requires:	libpng >= 2:1.6.25
-%{?with_system_libvpx:Requires:	libvpx >= 1.5.0}
+Requires:	glibc >= 6:2.17
+Requires:	gtk+3 >= 3.14.0
+Requires:	libdrm >= 2.4
+%{?with_system_icu:Requires:	libicu >= 67.1}
+Requires:	libjpeg-turbo
+Requires:	libpng >= 2:1.6.35
+Requires:	libstdc++ >= 6:4.8.1
+Requires:	libwebp >= 1.0.2
+%{?with_system_libvpx:Requires:	libvpx >= 1.8.0}
 Requires:	myspell-common
 Requires:	nspr >= 1:%{nspr_ver}
 Requires:	nss >= 1:%{nss_ver}
 Requires:	pango >= 1:1.22.0
-Requires:	sqlite3 >= %{sqlite_build_version}
-Requires:	startup-notification >= 0.8
-Requires:	libjpeg-turbo
-Obsoletes:	icedove
-Obsoletes:	mozilla-thunderbird
-Obsoletes:	mozilla-thunderbird-dictionary-en-US
+Requires:	xorg-lib-libxkbcommon >= 0.4.1
+Obsoletes:	icedove < 39
+Obsoletes:	mozilla-thunderbird < 32
+Obsoletes:	mozilla-thunderbird-dictionary-en-US < 2.0
+Obsoletes:	thunderbird-addon-lightning < 78.0
 Conflicts:	thunderbird-lang-resources < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -255,7 +277,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # firefox/thunderbird/seamonkey provide their own versions
 %define		_noautoprovfiles	%{_libdir}/%{name}/components
 
-%define		moz_caps		liblgpllibs.so libmozalloc.so libmozgtk.so libmozjs.so libmozsandbox.so libmozwayland.so libxul.so
+%define		moz_caps		liblgpllibs.so libmozalloc.so libmozgtk.so libmozjs.so libmozsandbox.so libmozsqlite3.so libmozwayland.so librnp.so libxul.so
 # we don't want these to satisfy packages depending on xulrunner
 %define		_noautoprov		%{moz_caps}
 # and as we don't provide them, don't require either
@@ -271,20 +293,19 @@ Thunderbird is an open-source, fast and portable email client.
 Thunderbird jest mającym otwarte źródła, szybkim i przenośnym klientem
 poczty.
 
-%package addon-lightning
-Summary:	An integrated calendar for Thunderbird
-Summary(pl.UTF-8):	Zintegrowany kalendarz dla Thunderbird
-License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
-Group:		Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	icedove-addon-lightning
+%package lang-af
+Summary:	Afrikaans resources for Thunderbird
+Summary(pl.UTF-8):	Afrykanerskie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
 
-%description addon-lightning
-Lightning is an calendar extension to Thunderbird email client.
+%description lang-af
+Afrikaans resources for Thunderbird.
 
-%description addon-lightning -l pl.UTF-8
-Lightning to rozszerzenie do klienta poczty Thunderbird dodające
-funkcjonalność kalendarza.
+%description lang-af -l pl.UTF-8
+Afrykanerskie pliki językowe dla Thunderbirda.
 
 %package lang-ar
 Summary:	Arabic resources for Thunderbird
@@ -292,8 +313,8 @@ Summary(pl.UTF-8):	Arabskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ar
-Obsoletes:	mozilla-thunderbird-lang-ar
+Obsoletes:	icedove-lang-ar < 39
+Obsoletes:	mozilla-thunderbird-lang-ar < 32
 BuildArch:	noarch
 
 %description lang-ar
@@ -308,8 +329,8 @@ Summary(pl.UTF-8):	Asturskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ast
-Obsoletes:	mozilla-thunderbird-lang-ast
+Obsoletes:	icedove-lang-ast < 39
+Obsoletes:	mozilla-thunderbird-lang-ast < 32
 BuildArch:	noarch
 
 %description lang-ast
@@ -324,8 +345,8 @@ Summary(pl.UTF-8):	Białoruskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-be
-Obsoletes:	mozilla-thunderbird-lang-be
+Obsoletes:	icedove-lang-be < 39
+Obsoletes:	mozilla-thunderbird-lang-be < 32
 BuildArch:	noarch
 
 %description lang-be
@@ -340,8 +361,8 @@ Summary(pl.UTF-8):	Bułgarskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-bg
-Obsoletes:	mozilla-thunderbird-lang-bg
+Obsoletes:	icedove-lang-bg < 39
+Obsoletes:	mozilla-thunderbird-lang-bg < 32
 BuildArch:	noarch
 
 %description lang-bg
@@ -356,8 +377,8 @@ Summary(pl.UTF-8):	Bengalskie pliki językowe dla Thunderbirda (wersja dla Bangl
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-bn
-Obsoletes:	mozilla-thunderbird-lang-bn
+Obsoletes:	icedove-lang-bn < 39
+Obsoletes:	mozilla-thunderbird-lang-bn < 32
 BuildArch:	noarch
 
 %description lang-bn
@@ -372,8 +393,8 @@ Summary(pl.UTF-8):	Bretońskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-br
-Obsoletes:	mozilla-thunderbird-lang-br
+Obsoletes:	icedove-lang-br < 39
+Obsoletes:	mozilla-thunderbird-lang-br < 32
 BuildArch:	noarch
 
 %description lang-br
@@ -388,8 +409,8 @@ Summary(pl.UTF-8):	Katalońskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ca
-Obsoletes:	mozilla-thunderbird-lang-ca
+Obsoletes:	icedove-lang-ca < 39
+Obsoletes:	mozilla-thunderbird-lang-ca < 32
 BuildArch:	noarch
 
 %description lang-ca
@@ -398,6 +419,20 @@ Catalan resources for Thunderbird.
 %description lang-ca -l pl.UTF-8
 Katalońskie pliki językowe dla Thunderbirda.
 
+%package lang-cak
+Summary:	Kaqchikel resources for Thunderbird
+Summary(pl.UTF-8):	Pliki językowe kaqchikel dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-cak
+Kaqchikel resources for Thunderbird.
+
+%description lang-cak -l pl.UTF-8
+Pliki językowe kaqchikel dla Thunderbirda.
+
 %package lang-cy
 Summary:	Welsh resources for Thunderbird
 Summary(pl.UTF-8):	Walijskie pliki językowe dla Thunderbirda
@@ -418,8 +453,8 @@ Summary(pl.UTF-8):	Czeskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-cs
-Obsoletes:	mozilla-thunderbird-lang-cs
+Obsoletes:	icedove-lang-cs < 39
+Obsoletes:	mozilla-thunderbird-lang-cs < 32
 BuildArch:	noarch
 
 %description lang-cs
@@ -434,8 +469,8 @@ Summary(pl.UTF-8):	Duńskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-da
-Obsoletes:	mozilla-thunderbird-lang-da
+Obsoletes:	icedove-lang-da < 39
+Obsoletes:	mozilla-thunderbird-lang-da < 32
 BuildArch:	noarch
 
 %description lang-da
@@ -450,8 +485,8 @@ Summary(pl.UTF-8):	Niemieckie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-de
-Obsoletes:	mozilla-thunderbird-lang-de
+Obsoletes:	icedove-lang-de < 39
+Obsoletes:	mozilla-thunderbird-lang-de < 32
 BuildArch:	noarch
 
 %description lang-de
@@ -480,8 +515,8 @@ Summary(pl.UTF-8):	Greckie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-el
-Obsoletes:	mozilla-thunderbird-lang-el
+Obsoletes:	icedove-lang-el < 39
+Obsoletes:	mozilla-thunderbird-lang-el < 32
 BuildArch:	noarch
 
 %description lang-el
@@ -490,14 +525,28 @@ Greek resources for Thunderbird.
 %description lang-el -l pl.UTF-8
 Greckie pliki językowe dla Thunderbirda.
 
+%package lang-en_CA
+Summary:	English (Canadian) resources for Thunderbird
+Summary(pl.UTF-8):	Angielskie (kanadyjskie) pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-en_CA
+English (Canadian) resources for Thunderbird.
+
+%description lang-en_CA -l pl.UTF-8
+Angielskie (kanadyjskie) pliki językowe dla Thunderbirda.
+
 %package lang-en_GB
 Summary:	English (British) resources for Thunderbird
 Summary(pl.UTF-8):	Angielskie (brytyjskie) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-en_GB
-Obsoletes:	mozilla-thunderbird-lang-en_GB
+Obsoletes:	icedove-lang-en_GB < 39
+Obsoletes:	mozilla-thunderbird-lang-en_GB < 32
 BuildArch:	noarch
 
 %description lang-en_GB
@@ -512,8 +561,8 @@ Summary(pl.UTF-8):	Angielskie (amerykańskie) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-en_US
-Obsoletes:	mozilla-thunderbird-lang-en_US
+Obsoletes:	icedove-lang-en_US < 39
+Obsoletes:	mozilla-thunderbird-lang-en_US < 32
 BuildArch:	noarch
 
 %description lang-en_US
@@ -528,8 +577,8 @@ Summary(pl.UTF-8):	Hiszpańskie pliki językowe dla Thunderbirda (wersja dla And
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-es_AR
-Obsoletes:	mozilla-thunderbird-lang-es_AR
+Obsoletes:	icedove-lang-es_AR < 39
+Obsoletes:	mozilla-thunderbird-lang-es_AR < 32
 BuildArch:	noarch
 
 %description lang-es_AR
@@ -544,8 +593,8 @@ Summary(pl.UTF-8):	Hiszpańskie pliki językowe dla Thunderbirda (wersja dla His
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-es
-Obsoletes:	mozilla-thunderbird-lang-es
+Obsoletes:	icedove-lang-es < 39
+Obsoletes:	mozilla-thunderbird-lang-es < 32
 BuildArch:	noarch
 
 %description lang-es
@@ -560,8 +609,8 @@ Summary(pl.UTF-8):	Estońskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-et
-Obsoletes:	mozilla-thunderbird-lang-et
+Obsoletes:	icedove-lang-et < 39
+Obsoletes:	mozilla-thunderbird-lang-et < 32
 BuildArch:	noarch
 
 %description lang-et
@@ -576,8 +625,8 @@ Summary(pl.UTF-8):	Baskijskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-eu
-Obsoletes:	mozilla-thunderbird-lang-eu
+Obsoletes:	icedove-lang-eu < 39
+Obsoletes:	mozilla-thunderbird-lang-eu < 32
 BuildArch:	noarch
 
 %description lang-eu
@@ -586,14 +635,28 @@ Basque resources for Thunderbird.
 %description lang-eu -l pl.UTF-8
 Baskijskie pliki językowe dla Thunderbirda.
 
+%package lang-fa
+Summary:	Persian resources for Thunderbird
+Summary(pl.UTF-8):	Perskie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-fa
+Persian resources for Thunderbird.
+
+%description lang-fa -l pl.UTF-8
+Perskie pliki językowe dla Thunderbirda.
+
 %package lang-fi
 Summary:	Finnish resources for Thunderbird
 Summary(pl.UTF-8):	Fińskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-fi
-Obsoletes:	mozilla-thunderbird-lang-fi
+Obsoletes:	icedove-lang-fi < 39
+Obsoletes:	mozilla-thunderbird-lang-fi < 32
 BuildArch:	noarch
 
 %description lang-fi
@@ -608,8 +671,8 @@ Summary(pl.UTF-8):	Francuskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-fr
-Obsoletes:	mozilla-thunderbird-lang-fr
+Obsoletes:	icedove-lang-fr < 39
+Obsoletes:	mozilla-thunderbird-lang-fr < 32
 BuildArch:	noarch
 
 %description lang-fr
@@ -624,8 +687,8 @@ Summary(pl.UTF-8):	Fryzyjskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-fy
-Obsoletes:	mozilla-thunderbird-lang-fy
+Obsoletes:	icedove-lang-fy < 39
+Obsoletes:	mozilla-thunderbird-lang-fy < 32
 BuildArch:	noarch
 
 %description lang-fy
@@ -640,8 +703,8 @@ Summary(pl.UTF-8):	Irlandzkie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ga
-Obsoletes:	mozilla-thunderbird-lang-ga
+Obsoletes:	icedove-lang-ga < 39
+Obsoletes:	mozilla-thunderbird-lang-ga < 32
 BuildArch:	noarch
 
 %description lang-ga
@@ -656,8 +719,8 @@ Summary(pl.UTF-8):	Szkockie (gaelickie) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-gd
-Obsoletes:	mozilla-thunderbird-lang-gd
+Obsoletes:	icedove-lang-gd < 39
+Obsoletes:	mozilla-thunderbird-lang-gd < 32
 BuildArch:	noarch
 
 %description lang-gd
@@ -672,8 +735,8 @@ Summary(pl.UTF-8):	Galicyjskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-gl
-Obsoletes:	mozilla-thunderbird-lang-gl
+Obsoletes:	icedove-lang-gl < 39
+Obsoletes:	mozilla-thunderbird-lang-gl < 32
 BuildArch:	noarch
 
 %description lang-gl
@@ -688,8 +751,8 @@ Summary(pl.UTF-8):	Hebrajskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-he
-Obsoletes:	mozilla-thunderbird-lang-he
+Obsoletes:	icedove-lang-he < 39
+Obsoletes:	mozilla-thunderbird-lang-he < 32
 BuildArch:	noarch
 
 %description lang-he
@@ -704,8 +767,8 @@ Summary(pl.UTF-8):	Chorwackie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-hr
-Obsoletes:	mozilla-thunderbird-lang-hr
+Obsoletes:	icedove-lang-hr < 39
+Obsoletes:	mozilla-thunderbird-lang-hr < 32
 BuildArch:	noarch
 
 %description lang-hr
@@ -734,8 +797,8 @@ Summary(pl.UTF-8):	Węgierskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-hu
-Obsoletes:	mozilla-thunderbird-lang-hu
+Obsoletes:	icedove-lang-hu < 39
+Obsoletes:	mozilla-thunderbird-lang-hu < 32
 BuildArch:	noarch
 
 %description lang-hu
@@ -750,8 +813,8 @@ Summary(pl.UTF-8):	Ormiańskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-hy
-Obsoletes:	mozilla-thunderbird-lang-hy
+Obsoletes:	icedove-lang-hy < 39
+Obsoletes:	mozilla-thunderbird-lang-hy < 32
 BuildArch:	noarch
 
 %description lang-hy
@@ -766,8 +829,8 @@ Summary(pl.UTF-8):	Indonezyjskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-id
-Obsoletes:	mozilla-thunderbird-lang-id
+Obsoletes:	icedove-lang-id < 39
+Obsoletes:	mozilla-thunderbird-lang-id < 32
 BuildArch:	noarch
 
 %description lang-id
@@ -782,8 +845,8 @@ Summary(pl.UTF-8):	Islandzkie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-is
-Obsoletes:	mozilla-thunderbird-lang-is
+Obsoletes:	icedove-lang-is < 39
+Obsoletes:	mozilla-thunderbird-lang-is < 32
 BuildArch:	noarch
 
 %description lang-is
@@ -798,8 +861,8 @@ Summary(pl.UTF-8):	Włoskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-it
-Obsoletes:	mozilla-thunderbird-lang-it
+Obsoletes:	icedove-lang-it < 39
+Obsoletes:	mozilla-thunderbird-lang-it < 32
 BuildArch:	noarch
 
 %description lang-it
@@ -814,8 +877,8 @@ Summary(pl.UTF-8):	Japońskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ja
-Obsoletes:	mozilla-thunderbird-lang-ja
+Obsoletes:	icedove-lang-ja < 39
+Obsoletes:	mozilla-thunderbird-lang-ja < 32
 BuildArch:	noarch
 
 %description lang-ja
@@ -824,6 +887,20 @@ Japanese resources for Thunderbird.
 %description lang-ja -l pl.UTF-8
 Japońskie pliki językowe dla Thunderbirda.
 
+%package lang-ka
+Summary:	Georgian resources for Thunderbird
+Summary(pl.UTF-8):	Gruzińskie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-ka
+Georgian resources for Thunderbird.
+
+%description lang-ka -l pl.UTF-8
+Gruzińskie pliki językowe dla Thunderbirda.
+
 %package lang-kab
 Summary:	Kabyle resources for Thunderbird
 Summary(pl.UTF-8):	Kabylskie pliki językowe dla Thunderbirda
@@ -858,8 +935,8 @@ Summary(pl.UTF-8):	Koreańskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ko
-Obsoletes:	mozilla-thunderbird-lang-ko
+Obsoletes:	icedove-lang-ko < 39
+Obsoletes:	mozilla-thunderbird-lang-ko < 32
 BuildArch:	noarch
 
 %description lang-ko
@@ -874,8 +951,8 @@ Summary(pl.UTF-8):	Litewskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-lt
-Obsoletes:	mozilla-thunderbird-lang-lt
+Obsoletes:	icedove-lang-lt < 39
+Obsoletes:	mozilla-thunderbird-lang-lt < 32
 BuildArch:	noarch
 
 %description lang-lt
@@ -904,8 +981,8 @@ Summary(pl.UTF-8):	Norweskie (bokmaal) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-nb
-Obsoletes:	mozilla-thunderbird-lang-nb
+Obsoletes:	icedove-lang-nb < 39
+Obsoletes:	mozilla-thunderbird-lang-nb < 32
 BuildArch:	noarch
 
 %description lang-nb
@@ -920,8 +997,8 @@ Summary(pl.UTF-8):	Holenderskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-nl
-Obsoletes:	mozilla-thunderbird-lang-nl
+Obsoletes:	icedove-lang-nl < 39
+Obsoletes:	mozilla-thunderbird-lang-nl < 32
 BuildArch:	noarch
 
 %description lang-nl
@@ -936,8 +1013,8 @@ Summary(pl.UTF-8):	Norweskie (nynorsk) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-nn
-Obsoletes:	mozilla-thunderbird-lang-nn
+Obsoletes:	icedove-lang-nn < 39
+Obsoletes:	mozilla-thunderbird-lang-nn < 32
 BuildArch:	noarch
 
 %description lang-nn
@@ -952,8 +1029,8 @@ Summary(pl.UTF-8):	Pendżabskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-pa
-Obsoletes:	mozilla-thunderbird-lang-pa
+Obsoletes:	icedove-lang-pa < 39
+Obsoletes:	mozilla-thunderbird-lang-pa < 32
 BuildArch:	noarch
 
 %description lang-pa
@@ -966,11 +1043,10 @@ Pendżabskie pliki językowe dla Thunderbirda.
 Summary:	Polish resources for Thunderbird
 Summary(pl.UTF-8):	Polskie pliki językowe dla Thunderbirda
 Group:		I18n
-URL:		http://www.thunderbird.pl/
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-pl
-Obsoletes:	mozilla-thunderbird-lang-pl
+Obsoletes:	icedove-lang-pl < 39
+Obsoletes:	mozilla-thunderbird-lang-pl < 32
 BuildArch:	noarch
 
 %description lang-pl
@@ -985,8 +1061,8 @@ Summary(pl.UTF-8):	Portugalskie (brazylijskie) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-pt_BR
-Obsoletes:	mozilla-thunderbird-lang-pt_BR
+Obsoletes:	icedove-lang-pt_BR < 39
+Obsoletes:	mozilla-thunderbird-lang-pt_BR < 32
 BuildArch:	noarch
 
 %description lang-pt_BR
@@ -1001,8 +1077,8 @@ Summary(pl.UTF-8):	Portugalskie pliki językowe dla Thunderbirda (wersja dla Por
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-pt
-Obsoletes:	mozilla-thunderbird-lang-pt
+Obsoletes:	icedove-lang-pt < 39
+Obsoletes:	mozilla-thunderbird-lang-pt < 32
 BuildArch:	noarch
 
 %description lang-pt
@@ -1017,8 +1093,8 @@ Summary(pl.UTF-8):	Retoromańskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-rm
-Obsoletes:	mozilla-thunderbird-lang-rm
+Obsoletes:	icedove-lang-rm < 39
+Obsoletes:	mozilla-thunderbird-lang-rm < 32
 BuildArch:	noarch
 
 %description lang-rm
@@ -1033,8 +1109,8 @@ Summary(pl.UTF-8):	Rumuńskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ro
-Obsoletes:	mozilla-thunderbird-lang-ro
+Obsoletes:	icedove-lang-ro < 39
+Obsoletes:	mozilla-thunderbird-lang-ro < 32
 BuildArch:	noarch
 
 %description lang-ro
@@ -1049,8 +1125,8 @@ Summary(pl.UTF-8):	Rosyjskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ru
-Obsoletes:	mozilla-thunderbird-lang-ru
+Obsoletes:	icedove-lang-ru < 39
+Obsoletes:	mozilla-thunderbird-lang-ru < 32
 BuildArch:	noarch
 
 %description lang-ru
@@ -1065,8 +1141,8 @@ Summary(pl.UTF-8):	Syngaleskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-si
-Obsoletes:	mozilla-thunderbird-lang-si
+Obsoletes:	icedove-lang-si < 39
+Obsoletes:	mozilla-thunderbird-lang-si < 32
 BuildArch:	noarch
 
 %description lang-si
@@ -1081,8 +1157,8 @@ Summary(pl.UTF-8):	Słowackie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-sk
-Obsoletes:	mozilla-thunderbird-lang-sk
+Obsoletes:	icedove-lang-sk < 39
+Obsoletes:	mozilla-thunderbird-lang-sk < 32
 BuildArch:	noarch
 
 %description lang-sk
@@ -1097,8 +1173,8 @@ Summary(pl.UTF-8):	Słoweńskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-sl
-Obsoletes:	mozilla-thunderbird-lang-sl
+Obsoletes:	icedove-lang-sl < 39
+Obsoletes:	mozilla-thunderbird-lang-sl < 32
 BuildArch:	noarch
 
 %description lang-sl
@@ -1113,8 +1189,8 @@ Summary(pl.UTF-8):	Albańskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-sq
-Obsoletes:	mozilla-thunderbird-lang-sq
+Obsoletes:	icedove-lang-sq < 39
+Obsoletes:	mozilla-thunderbird-lang-sq < 32
 BuildArch:	noarch
 
 %description lang-sq
@@ -1129,8 +1205,8 @@ Summary(pl.UTF-8):	Serbskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-sr
-Obsoletes:	mozilla-thunderbird-lang-sr
+Obsoletes:	icedove-lang-sr < 39
+Obsoletes:	mozilla-thunderbird-lang-sr < 32
 BuildArch:	noarch
 
 %description lang-sr
@@ -1145,8 +1221,8 @@ Summary(pl.UTF-8):	Szwedzkie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-sv
-Obsoletes:	mozilla-thunderbird-lang-sv
+Obsoletes:	icedove-lang-sv < 39
+Obsoletes:	mozilla-thunderbird-lang-sv < 32
 BuildArch:	noarch
 
 %description lang-sv
@@ -1161,8 +1237,8 @@ Summary(pl.UTF-8):	Tamilskie pliki językowe dla Thunderbirda (wersja dla Sri La
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-ta_LK
-Obsoletes:	mozilla-thunderbird-lang-ta_LK
+Obsoletes:	icedove-lang-ta_LK < 39
+Obsoletes:	mozilla-thunderbird-lang-ta_LK < 32
 BuildArch:	noarch
 
 %description lang-ta_LK
@@ -1171,14 +1247,28 @@ Tamil (Sri Lanka) resources for Thunderbird.
 %description lang-ta_LK -l pl.UTF-8
 Tamilskie pliki językowe dla Thunderbirda (wersja dla Sri Lanki).
 
+%package lang-th
+Summary:	Thai resources for Thunderbird
+Summary(pl.UTF-8):	Tajskie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-th
+Thai resources for Thunderbird.
+
+%description lang-th -l pl.UTF-8
+Tajskie pliki językowe dla Thunderbirda.
+
 %package lang-tr
 Summary:	Turkish resources for Thunderbird
 Summary(pl.UTF-8):	Tureckie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-tr
-Obsoletes:	mozilla-thunderbird-lang-tr
+Obsoletes:	icedove-lang-tr < 39
+Obsoletes:	mozilla-thunderbird-lang-tr < 32
 BuildArch:	noarch
 
 %description lang-tr
@@ -1193,8 +1283,8 @@ Summary(pl.UTF-8):	Ukraińskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-uk
-Obsoletes:	mozilla-thunderbird-lang-uk
+Obsoletes:	icedove-lang-uk < 39
+Obsoletes:	mozilla-thunderbird-lang-uk < 32
 BuildArch:	noarch
 
 %description lang-uk
@@ -1203,14 +1293,28 @@ Ukrainian resources for Thunderbird.
 %description lang-uk -l pl.UTF-8
 Ukraińskie pliki językowe dla Thunderbirda.
 
+%package lang-uz
+Summary:	Uzbek resources for Thunderbird
+Summary(pl.UTF-8):	Uzbeckie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-uz
+Uzbek resources for Thunderbird.
+
+%description lang-uz -l pl.UTF-8
+zbeckiee pliki językowe dla Thunderbirda.
+
 %package lang-vi
 Summary:	Vietnamese resources for Thunderbird
 Summary(pl.UTF-8):	Wietnamskie pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-vi
-Obsoletes:	mozilla-thunderbird-lang-vi
+Obsoletes:	icedove-lang-vi < 39
+Obsoletes:	mozilla-thunderbird-lang-vi < 32
 BuildArch:	noarch
 
 %description lang-vi
@@ -1225,8 +1329,8 @@ Summary(pl.UTF-8):	Chińskie (uproszczone) pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-zh_CN
-Obsoletes:	mozilla-thunderbird-lang-zh_CN
+Obsoletes:	icedove-lang-zh_CN < 39
+Obsoletes:	mozilla-thunderbird-lang-zh_CN < 32
 BuildArch:	noarch
 
 %description lang-zh_CN
@@ -1241,8 +1345,8 @@ Summary(pl.UTF-8):	Chińskie tradycyjne pliki językowe dla Thunderbirda
 Group:		I18n
 Requires:	thunderbird >= %{version}
 Provides:	thunderbird-lang-resources = %{version}
-Obsoletes:	icedove-lang-zh_TW
-Obsoletes:	mozilla-thunderbird-lang-zh_TW
+Obsoletes:	icedove-lang-zh_TW < 39
+Obsoletes:	mozilla-thunderbird-lang-zh_TW < 32
 BuildArch:	noarch
 
 %description lang-zh_TW
@@ -1257,11 +1361,11 @@ unpack() {
 	cp -p $file .
 }
 %define __unzip unpack
-%setup -q %(seq -f '-a %g' 100 157 | xargs)
+%setup -q %(seq -f '-a %g' 100 165 | xargs)
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p1
+%patch3 -p2
 
 %build
 cp -p %{_datadir}/automake/config.* build/autoconf
@@ -1331,28 +1435,19 @@ ac_add_options --disable-crashreporter
 %ifarch %{ix86} %{x8664} %{arm}
 ac_add_options --disable-elf-hack
 %endif
-ac_add_options --disable-gconf
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-alsa
 ac_add_options --enable-application=comm/mail
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-default-toolkit=cairo-gtk3
-%if %{with ldap}
-ac_add_options --enable-ldap
-%else
-ac_add_options --disable-ldap
-%endif
 %{?with_official:ac_add_options --enable-official-branding}
 %{?with_gold:ac_add_options --enable-linker=gold}
-ac_add_options --enable-readline
 %{?with_shared_js:ac_add_options --enable-shared-js}
-ac_add_options --enable-startup-notification
 %{?with_system_cairo:ac_add_options --enable-system-cairo}
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-pixman
 ac_add_options --with-distribution-id=org.pld-linux
-ac_add_options --with-system-bz2
+ac_add_options --with-system-ffi
 ac_add_options --with%{!?with_system_icu:out}-system-icu
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-libevent
@@ -1360,18 +1455,21 @@ ac_add_options --with%{!?with_system_libvpx:out}-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-png
+ac_add_options --with-system-webp
 ac_add_options --with-system-zlib
 EOF
 
 %if ! %{with clang}
 # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
-RPM_BUILD_NR_THREADS=1
+MOZ_PARALLEL_BUILD=1
 %ifarch %{x8664}
-jobs=$(echo %{_smp_mflags} | cut -dj -f2)
-[ -n "$jobs" -a "$jobs" -gt 4 ] && RPM_BUILD_NR_THREADS=4 || RPM_BUILD_NR_THREADS="$jobs"
+jobs="%{__jobs}"
+[ -n "$jobs" -a "$jobs" -gt 4 ] && MOZ_PARALLEL_BUILD=4 || MOZ_PARALLEL_BUILD="$jobs"
 %endif
-export MOZ_MAKE_FLAGS="-j${RPM_BUILD_NR_THREADS}"
+export MOZ_PARALLEL_BUILD
+%else
+%{?__jobs:export MOZ_PARALLEL_BUILD="%__jobs"}
 %endif
 
 AUTOCONF=/usr/bin/autoconf2_13 ./mach build
@@ -1468,7 +1566,9 @@ exit 0
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
 %endif
+%attr(755,root,root) %{_libdir}/%{name}/libmozsqlite3.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozwayland.so
+%attr(755,root,root) %{_libdir}/%{name}/librnp.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %attr(755,root,root) %{_libdir}/%{name}/*-bin
 %attr(755,root,root) %{_libdir}/%{name}/pingsender
@@ -1477,8 +1577,6 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/thunderbird
 
 %{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/blocklist.xml
-%{_libdir}/%{name}/chrome.manifest
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/omni.ja
 %{_libdir}/%{name}/platform.ini
@@ -1496,17 +1594,14 @@ exit 0
 %{_libdir}/%{name}/Throbber-small.gif
 %endif
 
-%dir %{_libdir}/%{name}/distribution
-%dir %{_libdir}/%{name}/distribution/extensions
-
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
 %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/isp
 
-%{_pixmapsdir}/*.png
-%{_desktopdir}/*.desktop
+%{_pixmapsdir}/thunderbird.png
+%{_desktopdir}/thunderbird.desktop
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
@@ -1514,11 +1609,9 @@ exit 0
 %dir %{_datadir}/%{name}/extensions
 %{_datadir}/%{name}/isp
 
-%if %{with lightning}
-%files addon-lightning
+%files lang-af
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
-%endif
+%{_datadir}/%{name}/extensions/langpack-af@thunderbird.mozilla.org.xpi
 
 %files lang-ar
 %defattr(644,root,root,755)
@@ -1544,6 +1637,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-ca@thunderbird.mozilla.org.xpi
 
+%files lang-cak
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-cak@thunderbird.mozilla.org.xpi
+
 %files lang-cs
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-cs@thunderbird.mozilla.org.xpi
@@ -1568,6 +1665,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-el@thunderbird.mozilla.org.xpi
 
+%files lang-en_CA
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-en-CA@thunderbird.mozilla.org.xpi
+
 %files lang-en_GB
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-en-GB@thunderbird.mozilla.org.xpi
@@ -1592,6 +1693,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-eu@thunderbird.mozilla.org.xpi
 
+%files lang-fa
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-fa@thunderbird.mozilla.org.xpi
+
 %files lang-fi
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-fi@thunderbird.mozilla.org.xpi
@@ -1652,6 +1757,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-ja@thunderbird.mozilla.org.xpi
 
+%files lang-ka
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ka@thunderbird.mozilla.org.xpi
+
 %files lang-kab
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-kab@thunderbird.mozilla.org.xpi
@@ -1684,6 +1793,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-nn-NO@thunderbird.mozilla.org.xpi
 
+%files lang-pa
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-pa-IN@thunderbird.mozilla.org.xpi
+
 %files lang-pl
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-pl@thunderbird.mozilla.org.xpi
@@ -1732,6 +1845,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-sv-SE@thunderbird.mozilla.org.xpi
 
+%files lang-th
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-th@thunderbird.mozilla.org.xpi
+
 %files lang-tr
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-tr@thunderbird.mozilla.org.xpi
@@ -1740,6 +1857,10 @@ exit 0
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-uk@thunderbird.mozilla.org.xpi
 
+%files lang-uz
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-uz@thunderbird.mozilla.org.xpi
+
 %files lang-vi
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/extensions/langpack-vi@thunderbird.mozilla.org.xpi