X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=thunderbird.spec;h=4ae30aa173eaf93a798e0da35bfa3fe1d0c821de;hb=88bf4e91ff924c58235db0596c5702d2f40782e1;hp=200d9b36f1d4431cd6088df339997554315fb9c7;hpb=19f2dc468ffd8ea24726e6dcb679977cd6d5d8c5;p=packages%2Fthunderbird.git

diff --git a/thunderbird.spec b/thunderbird.spec
index 200d9b3..aa7a3bb 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1,78 +1,231 @@
 # TODO:
 # - build with system mozldap
-# - fix startup crash "TypeError: a is null"
+# - do something with *.rdf file, there is file conflict with other lang packages
 #
 # Conditional builds
 %bcond_with	tests		# enable tests (whatever they check)
-%bcond_without	gtk3		# GTK+ 3.x instead of 2.x
-%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
+%bcond_with	gold		# use gold instead of default linker
 # - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
 %bcond_with	shared_js	# shared libmozjs library [broken]
-%bcond_with	system_icu	# build with system ICU (disabled due to crashes with system icu 58.2)
-%bcond_with	clang		# build using Clang/LLVM
+%bcond_without	system_icu	# build without system ICU
+%bcond_with	system_cairo	# build with system cairo (not supported in 60.0)
+%bcond_without	system_libvpx	# build with system libvpx
+%bcond_without	clang		# build using Clang/LLVM
+%bcond_with	lowmem		# lower memory requirements
+
+# UPDATING TRANSLATIONS:
+%if 0
+rm -vf *.xpi
+./builder -g
+V=31.4.0
+U=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$V/linux-i686/
+curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p'
+%endif
+
+%define		_enable_debug_packages	0
 
 %if 0%{?_enable_debug_packages} != 1
 %undefine	crashreporter
 %endif
 
-%define		nspr_ver	4.13.1
-%define		nss_ver		3.28.5
+%ifarch %{ix86} %{arm} aarch64
+%define		with_lowmem	1
+%endif
 
-# 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:	52.3.0
+Version:	78.6.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:	5841ee1a70423b9385110c82b78bef47
+# Source0-md5:	853eb1511136b99712c2cd2ace0a9790
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
+Source100:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/af.xpi
+# Source100-md5:	cae89922db383524511e82232b99f35d
+Source101:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ar.xpi
+# Source101-md5:	427c3bc39296ac501ee84f5dc287e954
+Source102:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ast.xpi
+# Source102-md5:	9843cbd9ff063d5faee4bd41b11ed636
+Source103:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/be.xpi
+# Source103-md5:	db188f8ace958f7d22abf9fdaec0ce85
+Source104:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/bg.xpi
+# Source104-md5:	3f8c10a2ba1345a106fb5f0721b90b3d
+Source105:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/br.xpi
+# Source105-md5:	fd76d71718e93da411e64e3a69ccb83c
+Source106:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ca.xpi
+# Source106-md5:	feb2c4bada1218552fd07954dca1bba6
+Source107:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/cak.xpi
+# Source107-md5:	3e76c52712646c5001562cf621f5634d
+Source108:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/cs.xpi
+# Source108-md5:	11156048f5a81c4659d755720d78221b
+Source109:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/cy.xpi
+# Source109-md5:	6204c3588853bee6ed85b8eaddb1ecb3
+Source110:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/da.xpi
+# Source110-md5:	3752ae91ec4ab67eead154a169270160
+Source111:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/de.xpi
+# Source111-md5:	262c96e0c5adffc3f8e449c6454228cd
+Source112:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/dsb.xpi
+# Source112-md5:	a2cb568ff0eaa8acb5b89a77cfeba460
+Source113:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/el.xpi
+# Source113-md5:	34b0d3e7677da1535fccd71fa9abbde5
+Source114:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/en-CA.xpi
+# Source114-md5:	62f45da4ea630ead8864bb1683e7dd1d
+Source115:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/en-GB.xpi
+# Source115-md5:	b3ec71b4b51b95f6a75c5944cae3be24
+Source116:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/en-US.xpi
+# Source116-md5:	53f7fc468edd3de51476d4bebb0a86b6
+Source117:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/es-AR.xpi
+# Source117-md5:	472c2fbbd1f32490e9927e2699060641
+Source118:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/es-ES.xpi
+# Source118-md5:	0f2004e683dd2ce02961c357c672cab8
+Source119:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/et.xpi
+# Source119-md5:	5dc1bbbc6f4a363367cc2931c33accd0
+Source120:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/eu.xpi
+# Source120-md5:	2fa3d75e92c9bab0c8dfa69354786948
+Source121:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fa.xpi
+# Source121-md5:	0fb7ccf49e0a8d7645d5e9fc8ce2153e
+Source122:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fi.xpi
+# Source122-md5:	335129e45697b577595aacc3c9db4684
+Source123:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fr.xpi
+# Source123-md5:	727732db4b132700425101f20f829c9b
+Source124:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/fy-NL.xpi
+# Source124-md5:	f6ec4d01a24f669db4813d20ceb6baeb
+Source125:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ga-IE.xpi
+# Source125-md5:	492135bce27f3ad609d255dcd7683b50
+Source126:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/gd.xpi
+# Source126-md5:	62e3f7f4a684e82005a892fb421cd4c6
+Source127:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/gl.xpi
+# Source127-md5:	b770bf56926d75f028674e405501671a
+Source128:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/he.xpi
+# Source128-md5:	970bacd1e0865d5117154703f4ef4920
+Source129:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hr.xpi
+# Source129-md5:	c94bb60a6a9fab4a984d03be50eadbe3
+Source130:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hsb.xpi
+# Source130-md5:	0350c9ccd9f8cd78aedfbfc8d36091d5
+Source131:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hu.xpi
+# Source131-md5:	f7514c47af11e93f29bc748697d17a5b
+Source132:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/hy-AM.xpi
+# Source132-md5:	9bfecfcbab4afdb5dbce8fef06b47d23
+Source133:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/id.xpi
+# Source133-md5:	17d7645e14803b2e2f28f7e10e20a450
+Source134:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/is.xpi
+# Source134-md5:	4b9b239ddf89c69f0a82b25497997079
+Source135:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/it.xpi
+# Source135-md5:	3e6931adf11ad6cf4cf5e81aef066d8e
+Source136:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ja.xpi
+# Source136-md5:	3a5e5144bae9cc3f306d005bd993cbd0
+Source137:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ka.xpi
+# Source137-md5:	8c8eecfd36faf7e6b851194c45b5c04b
+Source138:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/kab.xpi
+# Source138-md5:	cd1ecb7933d3f21e29973cab4d44c24d
+Source139:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/kk.xpi
+# Source139-md5:	70256e53f097d149eb72d97adc9f82ea
+Source140:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ko.xpi
+# Source140-md5:	fed6f607f16f5f0fdc8881de64cc598e
+Source141:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/lt.xpi
+# Source141-md5:	793951ca9bd938a5b1faaef37cd1134e
+Source142:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ms.xpi
+# Source142-md5:	016010cef4c70fca8503978e14966466
+Source143:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/nb-NO.xpi
+# Source143-md5:	e4ab599502926e5dcd63b7f4faa11cb6
+Source144:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/nl.xpi
+# Source144-md5:	eb425730bf1fc49fa317b080f0e8b1b6
+Source145:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/nn-NO.xpi
+# Source145-md5:	1c1b8f1f1a62515068f2e8776e23cf93
+Source146:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pa-IN.xpi
+# Source146-md5:	44b48c22110351b66f559182e12ba2f0
+Source147:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pl.xpi
+# Source147-md5:	fcf7e962fe9da979d8f72fd9b2f01468
+Source148:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pt-BR.xpi
+# Source148-md5:	c9372a2f17e22dc601e163708138b63d
+Source149:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/pt-PT.xpi
+# Source149-md5:	5a0af52c52f17ed3707165db23bd90bf
+Source150:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/rm.xpi
+# Source150-md5:	a3ad588d7a3c16b8001bcfeeb554d895
+Source151:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ro.xpi
+# Source151-md5:	81cb64f43aaa22832c68b05ac7c3d40a
+Source152:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/ru.xpi
+# Source152-md5:	22d53992a09b79767416fa4cad82c1f6
+Source153:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/si.xpi
+# Source153-md5:	986661bb8ff401daf8def6e54590236e
+Source154:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sk.xpi
+# Source154-md5:	65f809aa102956e5ead302cf0ca05661
+Source155:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sl.xpi
+# Source155-md5:	94d2c6edc0a6acb6514a4b2d386d2134
+Source156:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sq.xpi
+# Source156-md5:	de5d2cc7d7f3316f822cc50ec7ec6b74
+Source157:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sr.xpi
+# Source157-md5:	b4b2e009b49675d2d173d60c6d244b14
+Source158:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/sv-SE.xpi
+# Source158-md5:	e68367867c46f5f49bbc24bb3dde62b4
+Source159:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/th.xpi
+# Source159-md5:	64db21bd67cea4e76865b8c32793d75d
+Source160:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/tr.xpi
+# Source160-md5:	088c65cd0cc453c99c901766fcf52c69
+Source161:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/uk.xpi
+# Source161-md5:	08325d79fcf6f2d0247332ac1e37d2a6
+Source162:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/uz.xpi
+# Source162-md5:	7063ffa7392515c04d1ee620c399d4ba
+Source163:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/vi.xpi
+# Source163-md5:	c687a69d4d65eee046ae88f0721035e2
+Source164:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/zh-CN.xpi
+# Source164-md5:	bedf50908186311311bbe16c025a652b
+Source165:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/xpi/zh-TW.xpi
+# Source165-md5:	386bbc1054f51cc6947194119c82babb
 Patch0:		prefs.patch
 Patch1:		no-subshell.patch
 Patch2:		enable-addons.patch
-Patch3:		mozilla-1245783.patch
+Patch3:		%{name}-system-virtualenv.patch
 URL:		http://www.mozilla.org/projects/thunderbird/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf2_13 >= 2.13
-BuildRequires:	bzip2-devel
-BuildRequires:	cairo-devel >= 1.10
+%{?with_gold:BuildRequires:	binutils >= 3:2.20.51.0.7}
+%{?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
-%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.18.0}
-%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.4.0}
-BuildRequires:	hunspell-devel
+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 >= 58.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
-BuildRequires:	libvpx-devel >= 1.5.0
+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:	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:	python3 >= 1:3.8.5-3
+BuildRequires:	python3-virtualenv
+BuildRequires:	rust >= 1.34.0
+BuildRequires:	rust-cbindgen >= 0.14.1
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.17.0
-BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	virtualenv
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXcomposite-devel
@@ -80,40 +233,52 @@ 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
 %ifarch %{ix86} %{x8664}
 BuildRequires:	yasm >= 1.0.1
 %endif
 BuildRequires:	zip
 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
-%{!?with_gtk3:Requires:	gtk+2 >= 2:2.18.0}
-%{?with_gtk3:Requires:	gtk+3 >= 3.4.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.25
-Requires:	libvpx >= 1.5.0
+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
+Requires:	xorg-lib-libxkbcommon >= 0.4.1
 Obsoletes:	icedove
 Obsoletes:	mozilla-thunderbird
 Obsoletes:	mozilla-thunderbird-dictionary-en-US
+Obsoletes:	thunderbird-addon-lightning < 78.0
 Conflicts:	thunderbird-lang-resources < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		filterout_cpp		-D_FORTIFY_SOURCE=[0-9]+
 
+%if %{with clang}
+%define		filterout		-fvar-tracking-assignments
+%endif
+
 # 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 libmozsqlite3.so libmozwayland.so librnp.so libxul.so
 # we don't want these to satisfy packages depending on xulrunner
-%define		_noautoprov		libmozalloc.so libmozjs.so libxul.so
+%define		_noautoprov		%{moz_caps}
 # and as we don't provide them, don't require either
-%define		_noautoreq		libmozalloc.so libmozjs.so libxul.so
+%define		_noautoreq		%{moz_caps}
 
 %define		topdir		%{_builddir}/thunderbird-%{version}
 %define		objdir		%{topdir}/obj-%{_target_cpu}
@@ -125,30 +290,1086 @@ 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 lang-af
+Afrikaans resources for Thunderbird.
+
+%description lang-af -l pl.UTF-8
+Afrykanerskie pliki językowe dla Thunderbirda.
+
+%package lang-ar
+Summary:	Arabic resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ar
+Arabic resources for Thunderbird.
+
+%description lang-ar -l pl.UTF-8
+Arabskie pliki językowe dla Thunderbirda.
+
+%package lang-ast
+Summary:	Asturian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ast
+Asturian resources for Thunderbird.
+
+%description lang-ast -l pl.UTF-8
+Asturskie pliki językowe dla Thunderbirda.
+
+%package lang-be
+Summary:	Belarusian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-be
+Belarusian resources for Thunderbird.
+
+%description lang-be -l pl.UTF-8
+Białoruskie pliki językowe dla Thunderbirda.
+
+%package lang-bg
+Summary:	Bulgarian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-bg
+Bulgarian resources for Thunderbird.
+
+%description lang-bg -l pl.UTF-8
+Bułgarskie pliki językowe dla Thunderbirda.
+
+%package lang-bn
+Summary:	Bengali (Bangladesh) resources for Thunderbird
+Summary(pl.UTF-8):	Bengalskie pliki językowe dla Thunderbirda (wersja dla Bangladeszu)
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+Obsoletes:	icedove-lang-bn
+Obsoletes:	mozilla-thunderbird-lang-bn
+BuildArch:	noarch
+
+%description lang-bn
+Bengali (Bangladesh) resources for Thunderbird.
+
+%description lang-bn -l pl.UTF-8
+Bengalskie pliki językowe dla Thunderbirda (wersja dla Bangladeszu).
+
+%package lang-br
+Summary:	Breton resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-br
+Breton resources for Thunderbird.
+
+%description lang-br -l pl.UTF-8
+Bretońskie pliki językowe dla Thunderbirda.
+
+%package lang-ca
+Summary:	Catalan resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ca
+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
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-cy
+Welsh resources for Thunderbird.
+
+%description lang-cy -l pl.UTF-8
+Walijskie pliki językowe dla Thunderbirda.
+
+%package lang-cs
+Summary:	Czech resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-cs
+Czech resources for Thunderbird.
+
+%description lang-cs -l pl.UTF-8
+Czeskie pliki językowe dla Thunderbirda.
+
+%package lang-da
+Summary:	Danish resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-da
+Danish resources for Thunderbird.
+
+%description lang-da -l pl.UTF-8
+Duńskie pliki językowe dla Thunderbirda.
+
+%package lang-de
+Summary:	German resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-de
+German resources for Thunderbird.
+
+%description lang-de -l pl.UTF-8
+Niemieckie pliki językowe dla Thunderbirda.
+
+%package lang-dsb
+Summary:	Lower Sorbian resources for Thunderbird
+Summary(pl.UTF-8):	Dolnołużyckie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-dsb
+Lower Sorbian resources for Thunderbird.
+
+%description lang-dsb -l pl.UTF-8
+Dolnołużyckie pliki językowe dla Thunderbirda.
+
+%package lang-el
+Summary:	Greek resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-el
+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
+BuildArch:	noarch
+
+%description lang-en_GB
+English (British) resources for Thunderbird.
+
+%description lang-en_GB -l pl.UTF-8
+Angielskie (brytyjskie) pliki językowe dla Thunderbirda.
+
+%package lang-en_US
+Summary:	English (American) resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-en_US
+English (American) resources for Thunderbird.
+
+%description lang-en_US -l pl.UTF-8
+Angielskie (amerykańskie) pliki językowe dla Thunderbirda.
+
+%package lang-es_AR
+Summary:	Spanish (Andorra) resources for Thunderbird
+Summary(pl.UTF-8):	Hiszpańskie pliki językowe dla Thunderbirda (wersja dla Andory)
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+Obsoletes:	icedove-lang-es_AR
+Obsoletes:	mozilla-thunderbird-lang-es_AR
+BuildArch:	noarch
+
+%description lang-es_AR
+Spanish (Andorra) resources for Thunderbird.
+
+%description lang-es_AR -l pl.UTF-8
+Hiszpańskie pliki językowe dla Thunderbirda (wersja dla Andory).
+
+%package lang-es
+Summary:	Spanish (Spain) resources for Thunderbird
+Summary(pl.UTF-8):	Hiszpańskie pliki językowe dla Thunderbirda (wersja dla Hiszpanii)
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+Obsoletes:	icedove-lang-es
+Obsoletes:	mozilla-thunderbird-lang-es
+BuildArch:	noarch
+
+%description lang-es
+Spanish (Spain) resources for Thunderbird.
+
+%description lang-es -l pl.UTF-8
+Hiszpańskie pliki językowe dla Thunderbirda (wersja dla Hiszpanii).
+
+%package lang-et
+Summary:	Estonian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-et
+Estonian resources for Thunderbird.
+
+%description lang-et -l pl.UTF-8
+Estońskie pliki językowe dla Thunderbirda.
+
+%package lang-eu
+Summary:	Basque resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-eu
+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
+BuildArch:	noarch
+
+%description lang-fi
+Finnish resources for Thunderbird.
+
+%description lang-fi -l pl.UTF-8
+Fińskie pliki językowe dla Thunderbirda.
+
+%package lang-fr
+Summary:	French resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-fr
+French resources for Thunderbird.
+
+%description lang-fr -l pl.UTF-8
+Francuskie pliki językowe dla Thunderbirda.
+
+%package lang-fy
+Summary:	Frisian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-fy
+Frisian resources for Thunderbird.
+
+%description lang-fy -l pl.UTF-8
+Fryzyjskie pliki językowe dla Thunderbirda.
+
+%package lang-ga
+Summary:	Irish resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ga
+Irish resources for Thunderbird.
+
+%description lang-ga -l pl.UTF-8
+Irlandzkie pliki językowe dla Thunderbirda.
+
+%package lang-gd
+Summary:	Gaelic resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-gd
+Gaelic resources for Thunderbird.
+
+%description lang-gd -l pl.UTF-8
+Szkockie (gaelickie) pliki językowe dla Thunderbirda.
+
+%package lang-gl
+Summary:	Galician resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-gl
+Galician resources for Thunderbird.
+
+%description lang-gl -l pl.UTF-8
+Galicyjskie pliki językowe dla Thunderbirda.
+
+%package lang-he
+Summary:	Hebrew resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-he
+Hebrew resources for Thunderbird.
+
+%description lang-he -l pl.UTF-8
+Hebrajskie pliki językowe dla Thunderbirda.
+
+%package lang-hr
+Summary:	Croatian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-hr
+Croatian resources for Thunderbird.
+
+%description lang-hr -l pl.UTF-8
+Chorwackie pliki językowe dla Thunderbirda.
+
+%package lang-hsb
+Summary:	Upper Sorbian resources for Thunderbird
+Summary(pl.UTF-8):	Górnołużyckie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-hsb
+Upper Sorbian resources for Thunderbird.
+
+%description lang-hsb -l pl.UTF-8
+Górnołużyckie pliki językowe dla Thunderbirda.
+
+%package lang-hu
+Summary:	Hungarian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-hu
+Hungarian resources for Thunderbird.
+
+%description lang-hu -l pl.UTF-8
+Węgierskie pliki językowe dla Thunderbirda.
+
+%package lang-hy
+Summary:	Armenian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-hy
+Armenian resources for Thunderbird.
+
+%description lang-hy -l pl.UTF-8
+Ormiańskie pliki językowe dla Thunderbirda.
+
+%package lang-id
+Summary:	Indonesian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-id
+Indonesian resources for Thunderbird.
+
+%description lang-id -l pl.UTF-8
+Indonezyjskie pliki językowe dla Thunderbirda.
+
+%package lang-is
+Summary:	Icelandic resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-is
+Icelandic resources for Thunderbird.
+
+%description lang-is -l pl.UTF-8
+Islandzkie pliki językowe dla Thunderbirda.
+
+%package lang-it
+Summary:	Italian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-it
+Italian resources for Thunderbird.
+
+%description lang-it -l pl.UTF-8
+Włoskie pliki językowe dla Thunderbirda.
+
+%package lang-ja
+Summary:	Japanese resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ja
+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
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-kab
+Kabyle resources for Thunderbird.
+
+%description lang-kab -l pl.UTF-8
+Kabylskie pliki językowe dla Thunderbirda.
+
+%package lang-kk
+Summary:	Kazakh resources for Thunderbird
+Summary(pl.UTF-8):	Kazachskie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-kk
+Kazakh resources for Thunderbird.
+
+%description lang-kk -l pl.UTF-8
+Kazachskie pliki językowe dla Thunderbirda.
+
+%package lang-ko
+Summary:	Korean resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ko
+Korean resources for Thunderbird.
+
+%description lang-ko -l pl.UTF-8
+Koreańskie pliki językowe dla Thunderbirda.
+
+%package lang-lt
+Summary:	Lithuanian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-lt
+Lithuanian resources for Thunderbird.
+
+%description lang-lt -l pl.UTF-8
+Litewskie pliki językowe dla Thunderbirda.
+
+%package lang-ms
+Summary:	Malay resources for Thunderbird
+Summary(pl.UTF-8):	Malajskie pliki językowe dla Thunderbirda
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+BuildArch:	noarch
+
+%description lang-ms
+Malay resources for Thunderbird.
+
+%description lang-ms -l pl.UTF-8
+Malajskie pliki językowe dla Thunderbirda.
+
+%package lang-nb
+Summary:	Norwegian Bokmaal resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-nb
+Norwegian Bokmaal resources for Thunderbird.
+
+%description lang-nb -l pl.UTF-8
+Norweskie (bokmaal) pliki językowe dla Thunderbirda.
+
+%package lang-nl
+Summary:	Dutch resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-nl
+Dutch resources for Thunderbird.
+
+%description lang-nl -l pl.UTF-8
+Holenderskie pliki językowe dla Thunderbirda.
+
+%package lang-nn
+Summary:	Norwegian Nynorsk resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-nn
+Norwegian Nynorsk resources for Thunderbird.
+
+%description lang-nn -l pl.UTF-8
+Norweskie (nynorsk) pliki językowe dla Thunderbirda.
+
+%package lang-pa
+Summary:	Panjabi resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-pa
+Panjabi resources for Thunderbird.
+
+%description lang-pa -l pl.UTF-8
+Pendżabskie pliki językowe dla Thunderbirda.
+
+%package lang-pl
+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
+BuildArch:	noarch
+
+%description lang-pl
+Polish resources for Thunderbird.
+
+%description lang-pl -l pl.UTF-8
+Polskie pliki językowe dla Thunderbirda.
+
+%package lang-pt_BR
+Summary:	Portuguese (Brazil) resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-pt_BR
+Portuguese (Brazil) resources for Thunderbird.
+
+%description lang-pt_BR -l pl.UTF-8
+Portugalskie (brazylijskie) pliki językowe dla Thunderbirda.
+
+%package lang-pt
+Summary:	Portuguese (Portugal) resources for Thunderbird
+Summary(pl.UTF-8):	Portugalskie pliki językowe dla Thunderbirda (wersja dla Portugalii)
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+Obsoletes:	icedove-lang-pt
+Obsoletes:	mozilla-thunderbird-lang-pt
+BuildArch:	noarch
+
+%description lang-pt
+Portuguese (Portugal) resources for Thunderbird.
+
+%description lang-pt -l pl.UTF-8
+Portugalskie pliki językowe dla Thunderbirda (wersja dla Portugalii).
+
+%package lang-rm
+Summary:	Romansh resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-rm
+Romansh resources for Thunderbird.
+
+%description lang-rm -l pl.UTF-8
+Retoromańskie pliki językowe dla Thunderbirda.
+
+%package lang-ro
+Summary:	Romanian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ro
+Romanian resources for Thunderbird.
+
+%description lang-ro -l pl.UTF-8
+Rumuńskie pliki językowe dla Thunderbirda.
+
+%package lang-ru
+Summary:	Russian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-ru
+Russian resources for Thunderbird.
+
+%description lang-ru -l pl.UTF-8
+Rosyjskie pliki językowe dla Thunderbirda.
+
+%package lang-si
+Summary:	Sinhala resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-si
+Sinhala resources for Thunderbird.
+
+%description lang-si -l pl.UTF-8
+Syngaleskie pliki językowe dla Thunderbirda.
+
+%package lang-sk
+Summary:	Slovak resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-sk
+Slovak resources for Thunderbird.
+
+%description lang-sk -l pl.UTF-8
+Słowackie pliki językowe dla Thunderbirda.
+
+%package lang-sl
+Summary:	Slovene resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-sl
+Slovene resources for Thunderbird.
+
+%description lang-sl -l pl.UTF-8
+Słoweńskie pliki językowe dla Thunderbirda.
+
+%package lang-sq
+Summary:	Albanian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-sq
+Albanian resources for Thunderbird.
+
+%description lang-sq -l pl.UTF-8
+Albańskie pliki językowe dla Thunderbirda.
+
+%package lang-sr
+Summary:	Serbian resources for Thunderbird
+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
+BuildArch:	noarch
 
-%description addon-lightning
-Lightning is an calendar extension to Thunderbird email client.
+%description lang-sr
+Serbian resources for Thunderbird.
 
-%description addon-lightning -l pl.UTF-8
-Lightning to rozszerzenie do klienta poczty Thunderbird dodające
-funkcjonalność kalendarza.
+%description lang-sr -l pl.UTF-8
+Serbskie pliki językowe dla Thunderbirda.
+
+%package lang-sv
+Summary:	Swedish resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-sv
+Swedish resources for Thunderbird.
+
+%description lang-sv -l pl.UTF-8
+Szwedzkie pliki językowe dla Thunderbirda.
+
+%package lang-ta_LK
+Summary:	Tamil (Sri Lanka) resources for Thunderbird
+Summary(pl.UTF-8):	Tamilskie pliki językowe dla Thunderbirda (wersja dla Sri Lanki)
+Group:		I18n
+Requires:	thunderbird >= %{version}
+Provides:	thunderbird-lang-resources = %{version}
+Obsoletes:	icedove-lang-ta_LK
+Obsoletes:	mozilla-thunderbird-lang-ta_LK
+BuildArch:	noarch
+
+%description lang-ta_LK
+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
+BuildArch:	noarch
+
+%description lang-tr
+Turkish resources for Thunderbird.
+
+%description lang-tr -l pl.UTF-8
+Tureckie pliki językowe dla Thunderbirda.
+
+%package lang-uk
+Summary:	Ukrainian resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-uk
+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
+BuildArch:	noarch
+
+%description lang-vi
+Vietnamese resources for Thunderbird.
+
+%description lang-vi -l pl.UTF-8
+Wietnamskie pliki językowe dla Thunderbirda.
+
+%package lang-zh_CN
+Summary:	Simplified Chinese resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-zh_CN
+Simplified Chinese resources for Thunderbird.
+
+%description lang-zh_CN -l pl.UTF-8
+Chińskie (uproszczone) pliki językowe dla Thunderbirda.
+
+%package lang-zh_TW
+Summary:	Traditional Chinese resources for Thunderbird
+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
+BuildArch:	noarch
+
+%description lang-zh_TW
+Traditional Chinese resources for Thunderbird.
+
+%description lang-zh_TW -l pl.UTF-8
+Chińskie tradycyjne pliki językowe dla Thunderbirda.
 
 %prep
-%setup -q
+unpack() {
+	local args="$1" file="$2"
+	cp -p $file .
+}
+%define __unzip unpack
+%setup -q %(seq -f '-a %g' 100 165 | xargs)
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch2 -p0
+%patch3 -p2
 
 %build
-cat << EOF > .mozconfig
+cp -p %{_datadir}/automake/config.* build/autoconf
+
+cat << 'EOF' > .mozconfig
+. $topsrcdir/browser/config/mozconfig
 mk_add_options MOZ_OBJDIR=%{objdir}
 
 %if %{with clang}
@@ -158,14 +1379,30 @@ export CXX="clang++"
 export CC="%{__cc}"
 export CXX="%{__cxx}"
 %endif
+%ifarch %{ix86}
+export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
+export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64"
+%else
 export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
 export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64"
+%endif
+
+%if %{with lowmem}
+export CFLAGS="$CFLAGS -g0"
+export CXXFLAGS="$CXXFLAGS -g0"
+export MOZ_DEBUG_FLAGS=" "
+export LLVM_USE_SPLIT_DWARF=1
+export LLVM_PARALLEL_LINK_JOBS=1
+export MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+export RUSTFLAGS="-Cdebuginfo=0"
+%endif
 
 %if %{with crashreporter}
 export MOZ_DEBUG_SYMBOLS=1
 %endif
 
 # Options for 'configure' (same as command-line options).
+ac_add_options --host=%{_target_platform}
 ac_add_options --prefix=%{_prefix}
 %if %{?debug:1}0
 ac_add_options --disable-optimize
@@ -175,13 +1412,11 @@ ac_add_options --enable-debugger-info-modules
 ac_add_options --enable-crash-on-assert
 %else
 ac_add_options --disable-debug
-ac_add_options --enable-optimize="%{rpmcflags} -Os"
 %endif
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 %if %{with tests}
 ac_add_options --enable-tests
-ac_add_options --enable-mochitest
 %else
 ac_add_options --disable-tests
 %endif
@@ -195,51 +1430,47 @@ ac_add_options --enable-crashreporter
 %else
 ac_add_options --disable-crashreporter
 %endif
-#ac_add_options --disable-elf-hack
-ac_add_options --disable-gconf
-ac_add_options --disable-gnomeui
+%ifarch %{ix86} %{x8664} %{arm}
+ac_add_options --disable-elf-hack
+%endif
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-alsa
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=comm/mail
 ac_add_options --enable-chrome-format=omni
-ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
-ac_add_options --enable-gio
-%if %{with ldap}
-ac_add_options --enable-ldap
-%else
-ac_add_options --disable-ldap
-%endif
+ac_add_options --enable-default-toolkit=cairo-gtk3
 %{?with_official:ac_add_options --enable-official-branding}
-ac_add_options --enable-readline
+%{?with_gold:ac_add_options --enable-linker=gold}
 %{?with_shared_js:ac_add_options --enable-shared-js}
-ac_add_options --enable-startup-notification
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-url-classifier
-ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
+%{?with_system_cairo:ac_add_options --enable-system-cairo}
+ac_add_options --enable-system-pixman
 ac_add_options --with-distribution-id=org.pld-linux
-ac_add_options --with-pthreads
-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
-ac_add_options --with-system-libvpx
+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
-ac_add_options --with-x
 EOF
 
-mkdir -p %{objdir}/config
-ln -sf %{topdir}/mozilla/config/*.mk %{objdir}/config
+%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.
+MOZ_PARALLEL_BUILD=1
+%ifarch %{x8664}
+jobs="%{__jobs}"
+[ -n "$jobs" -a "$jobs" -gt 4 ] && MOZ_PARALLEL_BUILD=4 || MOZ_PARALLEL_BUILD="$jobs"
+%endif
+export MOZ_PARALLEL_BUILD
+%else
+%{?__jobs:export MOZ_PARALLEL_BUILD="%__jobs"}
+%endif
 
-%{__make} -j1 -f client.mk build \
-	AUTOCONF=/usr/bin/autoconf2_13 \
-	MOZ_MAKE_FLAGS="%{_smp_mflags}"
+AUTOCONF=/usr/bin/autoconf2_13 ./mach build
 
 %if %{with crashreporter}
 # create debuginfo for crash-stats.mozilla.com
@@ -248,10 +1479,10 @@ ln -sf %{topdir}/mozilla/config/*.mk %{objdir}/config
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/{extensions,plugins},%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir}}
 
 cd %{objdir}
-%{__make} -C mail/installer stage-package \
+%{__make} -C comm/mail/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	installdir=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
@@ -271,17 +1502,14 @@ cp -a dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD
 cp -p dist/thunderbird/chrome/icons/default/default48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
-# use system dict
-%{__rm} -rv $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
-
 # move arch independant ones to datadir
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
+ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
 ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
 
 # mozldap
@@ -291,12 +1519,22 @@ ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
 # remove unecessary stuff
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
 
+cd ..
+for a in *.xpi; do
+	basename=$(basename $a .xpi)
+	cp -p $a $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/langpack-$basename@thunderbird.mozilla.org.xpi
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pretrans
-if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
-	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
+if [ -d %{_libdir}/%{name}/extensions ] && [ ! -L %{_libdir}/%{name}/extensions ]; then
+	install -d %{_datadir}/%{name}
+	if [ -e %{_datadir}/%{name}/extensions ]; then
+		mv %{_datadir}/%{name}/extensions{,.rpmsave}
+	fi
+	mv -v %{_libdir}/%{name}/extensions %{_datadir}/%{name}/extensions
 fi
 for d in chrome defaults icons isp modules res; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
@@ -308,14 +1546,6 @@ exit 0
 
 %post
 %update_desktop_database_post
-# make temporary HOME, as it attempts to touch files in $HOME/.mozilla
-# dangerous if you run this with sudo with keep_env += HOME
-# also TMPDIR could be pointing to sudo user's homedir so we reset that too.
-export HOME=$(mktemp -d)
-unset TMPDIR TMP || :
-umask 022
-%{_libdir}/%{name}/thunderbird -register
-rm -rf $HOME
 
 %postun
 %update_desktop_database_postun
@@ -326,29 +1556,35 @@ rm -rf $HOME
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 
-%if %{with gtk3}
 %dir %{_libdir}/%{name}/gtk2
 %attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so
-%endif
 %attr(755,root,root) %{_libdir}/%{name}/liblgpllibs.so
 %{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
+%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}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/*-bin
+%attr(755,root,root) %{_libdir}/%{name}/pingsender
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
+%attr(755,root,root) %{_libdir}/%{name}/precomplete
 %attr(755,root,root) %{_libdir}/%{name}/thunderbird
 
 %{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/blocklist.xml
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/omni.ja
 %{_libdir}/%{name}/platform.ini
 %{!?with_system_icu:%{_libdir}/%{name}/icudt58l.dat}
 
+%dir %{_libdir}/%{name}/features
+%{_libdir}/%{name}/features/wetransfer@extensions.thunderbird.net.xpi
+
 %dir %{_libdir}/%{name}/fonts
-%{_libdir}/%{name}/fonts/EmojiOneMozilla.ttf
+%{_libdir}/%{name}/fonts/TwemojiMozilla.ttf
 
 %if %{with crashreporter}
 %attr(755,root,root) %{_libdir}/%{name}/crashreporter
@@ -356,42 +1592,281 @@ rm -rf $HOME
 %{_libdir}/%{name}/Throbber-small.gif
 %endif
 
-%dir %{_libdir}/%{name}/extensions
-%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
-
-%dir %{_libdir}/%{name}/distribution
-%dir %{_libdir}/%{name}/distribution/extensions
-
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/hyphenation
+%{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/isp
 
-%{_pixmapsdir}/*.png
-%{_desktopdir}/*.desktop
+%{_pixmapsdir}/thunderbird.png
+%{_desktopdir}/thunderbird.desktop
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
+%dir %{_datadir}/%{name}/extensions
 %{_datadir}/%{name}/isp
 
-%if %{with lightning}
-%files addon-lightning
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/app.ini
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.jar
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
-%dir %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.js
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*manifest
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.xpt
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js
-%dir %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones
-%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/zones.json
-%endif
+%files lang-af
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-af@thunderbird.mozilla.org.xpi
+
+%files lang-ar
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ar@thunderbird.mozilla.org.xpi
+
+%files lang-ast
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ast@thunderbird.mozilla.org.xpi
+
+%files lang-be
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-be@thunderbird.mozilla.org.xpi
+
+%files lang-bg
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-bg@thunderbird.mozilla.org.xpi
+
+%files lang-br
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-br@thunderbird.mozilla.org.xpi
+
+%files lang-ca
+%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
+
+%files lang-cy
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-cy@thunderbird.mozilla.org.xpi
+
+%files lang-da
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-da@thunderbird.mozilla.org.xpi
+
+%files lang-de
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-de@thunderbird.mozilla.org.xpi
+
+%files lang-dsb
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-dsb@thunderbird.mozilla.org.xpi
+
+%files lang-el
+%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
+
+%files lang-en_US
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-en-US@thunderbird.mozilla.org.xpi
+
+%files lang-es_AR
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-es-AR@thunderbird.mozilla.org.xpi
+
+%files lang-es
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-es-ES@thunderbird.mozilla.org.xpi
+
+%files lang-et
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-et@thunderbird.mozilla.org.xpi
+
+%files lang-eu
+%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
+
+%files lang-fr
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-fr@thunderbird.mozilla.org.xpi
+
+%files lang-fy
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-fy-NL@thunderbird.mozilla.org.xpi
+
+%files lang-ga
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ga-IE@thunderbird.mozilla.org.xpi
+
+%files lang-gd
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-gd@thunderbird.mozilla.org.xpi
+
+%files lang-gl
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-gl@thunderbird.mozilla.org.xpi
+
+%files lang-he
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-he@thunderbird.mozilla.org.xpi
+
+%files lang-hr
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-hr@thunderbird.mozilla.org.xpi
+
+%files lang-hsb
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-hsb@thunderbird.mozilla.org.xpi
+
+%files lang-hu
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-hu@thunderbird.mozilla.org.xpi
+
+%files lang-hy
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-hy-AM@thunderbird.mozilla.org.xpi
+
+%files lang-id
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-id@thunderbird.mozilla.org.xpi
+
+%files lang-is
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-is@thunderbird.mozilla.org.xpi
+
+%files lang-it
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-it@thunderbird.mozilla.org.xpi
+
+%files lang-ja
+%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
+
+%files lang-kk
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-kk@thunderbird.mozilla.org.xpi
+
+%files lang-ko
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ko@thunderbird.mozilla.org.xpi
+
+%files lang-lt
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-lt@thunderbird.mozilla.org.xpi
+
+%files lang-ms
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ms@thunderbird.mozilla.org.xpi
+
+%files lang-nb
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-nb-NO@thunderbird.mozilla.org.xpi
+
+%files lang-nl
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-nl@thunderbird.mozilla.org.xpi
+
+%files lang-nn
+%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
+
+%files lang-pt_BR
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-pt-BR@thunderbird.mozilla.org.xpi
+
+%files lang-pt
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-pt-PT@thunderbird.mozilla.org.xpi
+
+%files lang-rm
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-rm@thunderbird.mozilla.org.xpi
+
+%files lang-ro
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ro@thunderbird.mozilla.org.xpi
+
+%files lang-ru
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-ru@thunderbird.mozilla.org.xpi
+
+%files lang-si
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-si@thunderbird.mozilla.org.xpi
+
+%files lang-sk
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-sk@thunderbird.mozilla.org.xpi
+
+%files lang-sl
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-sl@thunderbird.mozilla.org.xpi
+
+%files lang-sq
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-sq@thunderbird.mozilla.org.xpi
+
+%files lang-sr
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-sr@thunderbird.mozilla.org.xpi
+
+%files lang-sv
+%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
+
+%files lang-uk
+%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
+
+%files lang-zh_CN
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-zh-CN@thunderbird.mozilla.org.xpi
+
+%files lang-zh_TW
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/extensions/langpack-zh-TW@thunderbird.mozilla.org.xpi