X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=thunderbird.spec;h=6d701a9d1288bf0de30ce7a684962011e73b136f;hb=ac7069e2534812149945863d916509d8d3ad0d58;hp=243364d56015b2df9a9e056c23a39409f722ed4b;hpb=2aea4435cd9642fd8ad63afe64c21720fddf89fd;p=packages%2Fthunderbird.git

diff --git a/thunderbird.spec b/thunderbird.spec
index 243364d..6d701a9 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -32,7 +32,7 @@ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p'
 %endif
 
 %define		nspr_ver	4.21
-%define		nss_ver		3.44.1
+%define		nss_ver		3.44.3
 
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
@@ -40,130 +40,130 @@ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p'
 Summary:	Thunderbird - email client
 Summary(pl.UTF-8):	Thunderbird - klient poczty
 Name:		thunderbird
-Version:	68.0
+Version:	68.4.2
 Release:	2
 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:	79fbff6edded2fce28026c617dec805c
+# Source0-md5:	12b7ad623f1e5c092abaa570f8233e51
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Source100:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ar.xpi
-# Source100-md5:	d5e114116a5e36856f3353f153d7bc61
+# Source100-md5:	4a96100afb6e6b0fd19af80f33df15c5
 Source101:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ast.xpi
-# Source101-md5:	2b2ac31bfb2e429f64323f35e62baf8f
+# Source101-md5:	103f989206308a82ee66e49628dfad1b
 Source102:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/be.xpi
-# Source102-md5:	ddf45714aa4b4f31aa396c3860b2228f
+# Source102-md5:	3a1892224c74375dfd313a5a0a6707fa
 Source103:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/bg.xpi
-# Source103-md5:	c20fc99646e5ef9f0c766d86b9da1adb
+# Source103-md5:	e908c377d759b83c4564e520972fee70
 Source104:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/br.xpi
-# Source104-md5:	d7ce37e52ea831a4e123f970e4b3d266
+# Source104-md5:	6455b36a70b3ab91fcd4d6fc5cfe58cb
 Source105:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ca.xpi
-# Source105-md5:	c57d00bfcad2db63acd5f04b3aa5394e
+# Source105-md5:	7b582cb45a5044eca5336a6907582455
 Source106:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cs.xpi
-# Source106-md5:	60ffd65ac5ccb8289adfb517a1a62dca
+# Source106-md5:	6096640cb45552c5f1a3421622c39cab
 Source107:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cy.xpi
-# Source107-md5:	b352ccb56b4d8eefe53ca9db54ade441
+# Source107-md5:	fc729dd87be411a0bbb3a41d6f80b7e2
 Source108:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/da.xpi
-# Source108-md5:	b2580d68bc3696c93becb7f580896df1
+# Source108-md5:	b27661b3204449e9794ce6237a123a07
 Source109:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/de.xpi
-# Source109-md5:	c6554eb16f9fba7cdcfcedc5d541b6f5
+# Source109-md5:	c01db5620ac10075f2b9e2c30e2543f8
 Source110:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/dsb.xpi
-# Source110-md5:	4ac6ee426e196b3226368413179a8e6c
+# Source110-md5:	04b1796784c06decb01d37a8c6adb2e3
 Source111:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/el.xpi
-# Source111-md5:	dd31d910010462670a49a946993f5a82
+# Source111-md5:	9312ad3ee702b64b30d9744b31d472a3
 Source112:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-GB.xpi
-# Source112-md5:	3ba76b86401665573f7feb53bec585cc
+# Source112-md5:	2aded120aeecb1e304d8aa91cb5f6399
 Source113:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-US.xpi
-# Source113-md5:	afc3399baafd6dd40280146762b7e215
+# Source113-md5:	6c51bd9d934a07359a30b32374d22094
 Source114:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-AR.xpi
-# Source114-md5:	24f9ce861b8bede5feb33aab47d84ce4
+# Source114-md5:	fc9fdc0f9b7857c300440b2f1c050cae
 Source115:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-ES.xpi
-# Source115-md5:	4eacbc0393b84e2eb3817c0c6ced62b4
+# Source115-md5:	a57c402aac551415ae9ad79fe1efe59d
 Source116:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/et.xpi
-# Source116-md5:	70074fc2361424d42b51e422f8a74ae2
+# Source116-md5:	26f4e7911f402eca25192349d17b40a2
 Source117:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/eu.xpi
-# Source117-md5:	303a3c31980e3d2a88787553cdb04280
+# Source117-md5:	f2142db016a96e438a707929253c6652
 Source118:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fi.xpi
-# Source118-md5:	ccddfdfa45aa87421c9e729fe771f510
+# Source118-md5:	16138d16c24a909ceb8e1ee60fcd63b2
 Source119:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fr.xpi
-# Source119-md5:	140d6f3befda4f227756304317f3e279
+# Source119-md5:	13830ce5b90f56bf3fc38aaaddbf143a
 Source120:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fy-NL.xpi
-# Source120-md5:	c656b1c21c64435bfbca05e2c4d462a0
+# Source120-md5:	e9e7d88a5643a0969500f3ce06cf94cf
 Source121:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ga-IE.xpi
-# Source121-md5:	84deed1b3170bc89cf928650da717feb
+# Source121-md5:	af51757be12d66dec48873ab362b731b
 Source122:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gd.xpi
-# Source122-md5:	7321c9f9fcd844ff4954f4e87b303bd7
+# Source122-md5:	eefa5c3849d870684fe0957c83c7d681
 Source123:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gl.xpi
-# Source123-md5:	77475473005736d8a4782ffe7303067a
+# Source123-md5:	32527333824c7d49a0a2b908d726c598
 Source124:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/he.xpi
-# Source124-md5:	65cc42ea29a8decab59a053a4727217e
+# Source124-md5:	808038ed8aa41772bcfc7dcb5d5865d2
 Source125:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hr.xpi
-# Source125-md5:	51f62444887a5e30804ed38b69c7acff
+# Source125-md5:	f51715dfb0ee791acd8631217f3f6464
 Source126:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hsb.xpi
-# Source126-md5:	f1370c44368e674977135a79c379c798
+# Source126-md5:	4a8e11a1f6e913706706ae830b96034a
 Source127:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hu.xpi
-# Source127-md5:	fe8b2c7631f8dd7a21504eb685ff7531
+# Source127-md5:	02a0c9404a606ce3930aaaeb07ca6d43
 Source128:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hy-AM.xpi
-# Source128-md5:	2d662e9d1f7e041da00010f156cdf768
+# Source128-md5:	497f0a6a1bfaabe865f7a15e5cf92cb7
 Source129:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/id.xpi
-# Source129-md5:	b13d1286a490e1116ed7980e85d5a099
+# Source129-md5:	84e2a398e0235bb9827b7c469bb99e76
 Source130:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/is.xpi
-# Source130-md5:	8be73084b5812588158986735f71a3f3
+# Source130-md5:	46c18c7bb877a8cc7fb4e5635e85d8cb
 Source131:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/it.xpi
-# Source131-md5:	e8513a35d4d7bbcaabbfd78da24db72a
+# Source131-md5:	b655d28ee0b86dbf9366c7484655f60e
 Source132:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ja.xpi
-# Source132-md5:	0d64b38da764674fbb18396dc991d332
+# Source132-md5:	c48f82d4834a1d9b4244f91fd8826822
 Source133:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kab.xpi
-# Source133-md5:	b2d1d5dd6a2be6e021f73003da3044a4
+# Source133-md5:	1eb920ac0ace9306526b0c2d3ab69fc4
 Source134:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kk.xpi
-# Source134-md5:	962a95cfcb93aa72cc46d37b8d24d853
+# Source134-md5:	83315b2ab60dea378dd040d3f94e868b
 Source135:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ko.xpi
-# Source135-md5:	9da478aee2b85aa1af91d4adde523860
+# Source135-md5:	712bac2f1574bd635d80d50df8e6b98a
 Source136:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/lt.xpi
-# Source136-md5:	d53cadbd712b26134b333a2c2540c0a3
+# Source136-md5:	b0c084352aa8a0f99f66b3e19494b594
 Source137:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ms.xpi
-# Source137-md5:	ec17a19acd79bdf956d3f0df67c8d381
+# Source137-md5:	521829211fcfa81bd2b13c58a266faac
 Source138:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nb-NO.xpi
-# Source138-md5:	ff43e00a84325083b1eab08744e0c473
+# Source138-md5:	00736a200277d4c0f3948a4be28461e6
 Source139:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nl.xpi
-# Source139-md5:	a5d721f6b688d57074dd39ef95e2a6cf
+# Source139-md5:	33f2ee5137d011fa797fa1c8c8388466
 Source140:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nn-NO.xpi
-# Source140-md5:	acfcb526762615d5cb7570b49b147537
+# Source140-md5:	7e0bc79253f7effee622059af9f92c48
 Source141:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pl.xpi
-# Source141-md5:	0564c146722bae34ad39efd801eff587
+# Source141-md5:	91ef4f9ed2b9dd03fa2c176a1bae2d7d
 Source142:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-BR.xpi
-# Source142-md5:	72a8bc3dbda72559437efc12caecb8e8
+# Source142-md5:	43a9cd8c3a211b74f7aa235366ba15e9
 Source143:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-PT.xpi
-# Source143-md5:	8f09353c5b9e69f995b6737862979dec
+# Source143-md5:	11462c5a428051e930bf9bb0f2811dea
 Source144:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/rm.xpi
-# Source144-md5:	3c7e21574546f6bc11f6cfaac4416893
+# Source144-md5:	96424bfbb57bd06773cbaa2e364f8441
 Source145:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ro.xpi
-# Source145-md5:	ee7293b221c8d32d76bae90b87734561
+# Source145-md5:	19e4f1c5a332f4ed207b9ecefc8d4636
 Source146:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ru.xpi
-# Source146-md5:	7357452581604895bae66088fa3ef54e
+# Source146-md5:	269262c87de12d1c42e7956d20cf5c95
 Source147:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/si.xpi
-# Source147-md5:	5e12bef0bc2a742a22ca6b8babb13fa5
+# Source147-md5:	017f6d2d139938fdfbb0451f0e713017
 Source148:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sk.xpi
-# Source148-md5:	67cdb3d53d79af83a5fa19b8467f67a4
+# Source148-md5:	2b2c97ef29513ebbfe1fa187834a718a
 Source149:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sl.xpi
-# Source149-md5:	72f988b4997bef2c8aa1a13b3968ba60
+# Source149-md5:	c57adcca7bf8d84c28c01e8b981fcbe1
 Source150:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sq.xpi
-# Source150-md5:	fba648aacaf1f623262d2d2ae7b67553
+# Source150-md5:	2f65f6bb0980df7014a80d1f5b14ddbc
 Source151:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sr.xpi
-# Source151-md5:	80a3e322da3c9359483347c9469ddd67
+# Source151-md5:	5cda1c06eea98aaeb553766db22a66ee
 Source152:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sv-SE.xpi
-# Source152-md5:	ef7617e052a45d2864dd9bebc22c74ad
+# Source152-md5:	6988097ff0971228657b98f62a5e4989
 Source153:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/tr.xpi
-# Source153-md5:	2d239b6eb141d30d6f60b603459a8e6a
+# Source153-md5:	701bd1448be8a4dae302f7c294cd05fc
 Source154:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/uk.xpi
-# Source154-md5:	3c16e9c798c6289855daad0c28568fe0
+# Source154-md5:	b2169f309315fc35c1d0c9caf38e9213
 Source155:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/vi.xpi
-# Source155-md5:	d6552117e8bf0da91d32af77d278da50
+# Source155-md5:	c800cca5566be9e9165e7b474c56b07d
 Source156:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-CN.xpi
-# Source156-md5:	b3fde48e00cb3c7a4ce2e59e5afc4fde
+# Source156-md5:	10c502db6e48c6f64bd166c185176dda
 Source157:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-TW.xpi
-# Source157-md5:	dadb95754415a28ad5e5a7818e2edb5d
+# Source157-md5:	7f267a311505ec36a454a982fa3ec2ae
 Patch0:		prefs.patch
 Patch1:		no-subshell.patch
 Patch2:		enable-addons.patch
@@ -1349,7 +1349,16 @@ ac_add_options --with-system-png
 ac_add_options --with-system-zlib
 EOF
 
-%{!?with_clang:export MOZ_MAKE_FLAGS="-j1"}
+%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
+%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"
+%endif
+export MOZ_MAKE_FLAGS="-j${RPM_BUILD_NR_THREADS}"
+%endif
 
 AUTOCONF=/usr/bin/autoconf2_13 ./mach build
 
@@ -1427,14 +1436,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
@@ -1494,6 +1495,7 @@ rm -rf $HOME
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
+%dir %{_datadir}/%{name}/extensions
 %{_datadir}/%{name}/isp
 
 %if %{with lightning}