]> git.pld-linux.org Git - packages/thunderbird.git/blobdiff - thunderbird.spec
projects / packages / thunderbird.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- rebuild with libevent 2.1.11
[packages/thunderbird.git] / thunderbird.spec
diff --git a/thunderbird.spec b/thunderbird.spec
index 038402c44228857c8c7ca4ff7fb622373329a42d..6d701a9d1288bf0de30ce7a684962011e73b136f 100644 (file)
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -8,11 +8,13 @@
 %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_without system_icu      # build without system ICU
 %bcond_with    system_cairo    # build with system cairo (not supported in 60.0)
-%bcond_without clang           # build using Clang/LLVM
+%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
 
 # UPDATING TRANSLATIONS:
 %if 0
@@ -23,12 +25,14 @@ 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.19
-%define                nss_ver         3.36.4
+%define                nspr_ver        4.21
+%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)
@@ -36,136 +40,138 @@ 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:       60.0
-Release:       1
+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: aaba788a2eb99e0bac317047ebe61b45
+# 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:       de5fb60589a725bfc4040ad2c1921038
+# Source100-md5:       4a96100afb6e6b0fd19af80f33df15c5
 Source101:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ast.xpi
-# Source101-md5:       8f19123b51ccc8c1e4f8317490cebf67
+# Source101-md5:       103f989206308a82ee66e49628dfad1b
 Source102:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/be.xpi
-# Source102-md5:       0b9631e7039437132e42ffa0fd791b62
+# Source102-md5:       3a1892224c74375dfd313a5a0a6707fa
 Source103:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/bg.xpi
-# Source103-md5:       2cb2587201f717dfb352732a8537c5b5
+# Source103-md5:       e908c377d759b83c4564e520972fee70
 Source104:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/br.xpi
-# Source104-md5:       b46abe694c40cc055341a81687daa60f
+# Source104-md5:       6455b36a70b3ab91fcd4d6fc5cfe58cb
 Source105:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ca.xpi
-# Source105-md5:       06f4949fc9dd41367720a28c26dc9372
+# Source105-md5:       7b582cb45a5044eca5336a6907582455
 Source106:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cs.xpi
-# Source106-md5:       495485523d190de80c8fd485077b51fc
+# Source106-md5:       6096640cb45552c5f1a3421622c39cab
 Source107:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cy.xpi
-# Source107-md5:       a83c26d480c8a659b564f986428eee53
+# Source107-md5:       fc729dd87be411a0bbb3a41d6f80b7e2
 Source108:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/da.xpi
-# Source108-md5:       5e6aadf20f55b785c535389793534bf3
+# Source108-md5:       b27661b3204449e9794ce6237a123a07
 Source109:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/de.xpi
-# Source109-md5:       e21a5906301b39e4a5ed575d0b2dcc9b
+# Source109-md5:       c01db5620ac10075f2b9e2c30e2543f8
 Source110:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/dsb.xpi
-# Source110-md5:       218cb863e515d6a843588476b59fbcae
+# Source110-md5:       04b1796784c06decb01d37a8c6adb2e3
 Source111:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/el.xpi
-# Source111-md5:       9035cb4f6fc317a3ca54fc342955e4f9
+# Source111-md5:       9312ad3ee702b64b30d9744b31d472a3
 Source112:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-GB.xpi
-# Source112-md5:       bb5667de2553c0bd8689c8e99d54e634
+# Source112-md5:       2aded120aeecb1e304d8aa91cb5f6399
 Source113:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-US.xpi
-# Source113-md5:       f85ac1b2f7bd064cdce4e8f2cd40349b
+# Source113-md5:       6c51bd9d934a07359a30b32374d22094
 Source114:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-AR.xpi
-# Source114-md5:       e68c79bbbc38c26670a06fe9e3e8f53f
+# Source114-md5:       fc9fdc0f9b7857c300440b2f1c050cae
 Source115:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-ES.xpi
-# Source115-md5:       be9c7cdd69390b44eaae4b6ed7a1d7c4
+# Source115-md5:       a57c402aac551415ae9ad79fe1efe59d
 Source116:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/et.xpi
-# Source116-md5:       7b952ab40b3dead8f34edb443b45ef7a
+# Source116-md5:       26f4e7911f402eca25192349d17b40a2
 Source117:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/eu.xpi
-# Source117-md5:       1d423465f9fe99e2c4f9a8dbb0a43120
+# Source117-md5:       f2142db016a96e438a707929253c6652
 Source118:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fi.xpi
-# Source118-md5:       b55ab241b6dcf7f5010d1658cb3eb967
+# Source118-md5:       16138d16c24a909ceb8e1ee60fcd63b2
 Source119:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fr.xpi
-# Source119-md5:       f7000dba1355f73fb0a3d2bb18be40ff
+# Source119-md5:       13830ce5b90f56bf3fc38aaaddbf143a
 Source120:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fy-NL.xpi
-# Source120-md5:       9e1a98fc15ad50785197da4f3165076a
+# Source120-md5:       e9e7d88a5643a0969500f3ce06cf94cf
 Source121:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ga-IE.xpi
-# Source121-md5:       51f7c304c28eb7b4e499912544614599
+# Source121-md5:       af51757be12d66dec48873ab362b731b
 Source122:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gd.xpi
-# Source122-md5:       cec516d3d746707d0eacc8bb72b1605d
+# Source122-md5:       eefa5c3849d870684fe0957c83c7d681
 Source123:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gl.xpi
-# Source123-md5:       3105ce333fd83a2fd30617fe34ed82d3
+# Source123-md5:       32527333824c7d49a0a2b908d726c598
 Source124:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/he.xpi
-# Source124-md5:       31db59fa27d12a5651b8e5c4060765b5
+# Source124-md5:       808038ed8aa41772bcfc7dcb5d5865d2
 Source125:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hr.xpi
-# Source125-md5:       173c71c470fd6ff2f9fb4750a4198419
+# Source125-md5:       f51715dfb0ee791acd8631217f3f6464
 Source126:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hsb.xpi
-# Source126-md5:       b85e1b38174750f8d2abb710d4960c0e
+# Source126-md5:       4a8e11a1f6e913706706ae830b96034a
 Source127:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hu.xpi
-# Source127-md5:       fe90e9feaf4deb7c1a424f9a6f2f6da1
+# Source127-md5:       02a0c9404a606ce3930aaaeb07ca6d43
 Source128:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hy-AM.xpi
-# Source128-md5:       6cd72d4a95d5bf05c8f68ca227a2946f
+# Source128-md5:       497f0a6a1bfaabe865f7a15e5cf92cb7
 Source129:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/id.xpi
-# Source129-md5:       99485a89a9ff92fab71e60507bf6193d
+# Source129-md5:       84e2a398e0235bb9827b7c469bb99e76
 Source130:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/is.xpi
-# Source130-md5:       aad635b1bc2c06d38ae3a517552f9de1
+# Source130-md5:       46c18c7bb877a8cc7fb4e5635e85d8cb
 Source131:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/it.xpi
-# Source131-md5:       1583829631695788339c55499a502ea5
+# Source131-md5:       b655d28ee0b86dbf9366c7484655f60e
 Source132:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ja.xpi
-# Source132-md5:       e1be8204c7fa76c002d200d89069fb3f
+# Source132-md5:       c48f82d4834a1d9b4244f91fd8826822
 Source133:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kab.xpi
-# Source133-md5:       31e494aa0eb92fbe40ee18705baebade
+# Source133-md5:       1eb920ac0ace9306526b0c2d3ab69fc4
 Source134:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kk.xpi
-# Source134-md5:       8bdcbba85fd6af876cdde313e17f4f94
+# Source134-md5:       83315b2ab60dea378dd040d3f94e868b
 Source135:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ko.xpi
-# Source135-md5:       0dcc993a957c19281524dd581fa3d5b1
+# Source135-md5:       712bac2f1574bd635d80d50df8e6b98a
 Source136:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/lt.xpi
-# Source136-md5:       91139ddd654771124a039d4ff0615b1b
+# Source136-md5:       b0c084352aa8a0f99f66b3e19494b594
 Source137:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ms.xpi
-# Source137-md5:       76d8fbf4143906cd2ee6e014319b673a
+# Source137-md5:       521829211fcfa81bd2b13c58a266faac
 Source138:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nb-NO.xpi
-# Source138-md5:       ab1b4e5a89385172db65a0b2747ede6a
+# Source138-md5:       00736a200277d4c0f3948a4be28461e6
 Source139:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nl.xpi
-# Source139-md5:       59c3a9986c0ca4a18ff1599fdc4b3aa0
+# Source139-md5:       33f2ee5137d011fa797fa1c8c8388466
 Source140:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nn-NO.xpi
-# Source140-md5:       986c9c70930df0a494257648a1055e3f
+# Source140-md5:       7e0bc79253f7effee622059af9f92c48
 Source141:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pl.xpi
-# Source141-md5:       4ba1887b35b423b1a7bd7d84b2dd34d2
+# Source141-md5:       91ef4f9ed2b9dd03fa2c176a1bae2d7d
 Source142:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-BR.xpi
-# Source142-md5:       25ccae83edc3b782182ecc4f052e543a
+# Source142-md5:       43a9cd8c3a211b74f7aa235366ba15e9
 Source143:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-PT.xpi
-# Source143-md5:       f2167fc54d9474e95970835bafe80d5b
+# Source143-md5:       11462c5a428051e930bf9bb0f2811dea
 Source144:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/rm.xpi
-# Source144-md5:       5a7edde60450e7f718ee9fe5bd0cd692
+# Source144-md5:       96424bfbb57bd06773cbaa2e364f8441
 Source145:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ro.xpi
-# Source145-md5:       58c885fc5c3dcfd3973311a28dd3d928
+# Source145-md5:       19e4f1c5a332f4ed207b9ecefc8d4636
 Source146:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ru.xpi
-# Source146-md5:       4a4033cbcc6038316cc88529f28e6cf3
+# Source146-md5:       269262c87de12d1c42e7956d20cf5c95
 Source147:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/si.xpi
-# Source147-md5:       7e90ba4cd445f454a6d146a55d06152c
+# Source147-md5:       017f6d2d139938fdfbb0451f0e713017
 Source148:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sk.xpi
-# Source148-md5:       3046685c080b22cc191ba129b82bb49b
+# Source148-md5:       2b2c97ef29513ebbfe1fa187834a718a
 Source149:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sl.xpi
-# Source149-md5:       18c7092cbfeb54d69d715fde85c32e94
+# Source149-md5:       c57adcca7bf8d84c28c01e8b981fcbe1
 Source150:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sq.xpi
-# Source150-md5:       87ec63932febbd046249be51a9555f1b
+# Source150-md5:       2f65f6bb0980df7014a80d1f5b14ddbc
 Source151:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sr.xpi
-# Source151-md5:       a3e646475074658adc78db12bd2ec3ee
+# Source151-md5:       5cda1c06eea98aaeb553766db22a66ee
 Source152:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sv-SE.xpi
-# Source152-md5:       e26227c680a8e8fa4f052960642268ae
+# Source152-md5:       6988097ff0971228657b98f62a5e4989
 Source153:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/tr.xpi
-# Source153-md5:       36528ffa2c321b80d06548abbb3b2b2f
+# Source153-md5:       701bd1448be8a4dae302f7c294cd05fc
 Source154:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/uk.xpi
-# Source154-md5:       7e98999abf8b8be94feb572a8ab2fc5d
+# Source154-md5:       b2169f309315fc35c1d0c9caf38e9213
 Source155:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/vi.xpi
-# Source155-md5:       4ce122ba7a160c592116cc7c0b08bf01
+# Source155-md5:       c800cca5566be9e9165e7b474c56b07d
 Source156:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-CN.xpi
-# Source156-md5:       28f758468fc875828475658b65c941fc
+# Source156-md5:       10c502db6e48c6f64bd166c185176dda
 Source157:     http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-TW.xpi
-# Source157-md5:       9d6cb764e821678c17ca7d75f517c918
+# Source157-md5:       7f267a311505ec36a454a982fa3ec2ae
 Patch0:                prefs.patch
 Patch1:                no-subshell.patch
 Patch2:                enable-addons.patch
+Patch3:                format.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
@@ -176,18 +182,17 @@ 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: hunspell-devel
 BuildRequires: libatomic-devel
 BuildRequires: libevent-devel
 BuildRequires: libffi-devel > 3.0.9
-%{?with_system_icu:BuildRequires:      libicu-devel >= 58.1}
+%{?with_system_icu:BuildRequires:      libicu-devel >= 63.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
+%{?with_system_libvpx:BuildRequires:   libvpx-devel >= 1.5.0}
 BuildRequires: llvm-devel
 BuildRequires: mozldap-devel
 BuildRequires: nspr-devel >= 1:%{nspr_ver}
@@ -198,9 +203,10 @@ BuildRequires:     pixman-devel >= 0.19.2
 BuildRequires: pkgconfig
 BuildRequires: python >= 1:2.7
 BuildRequires: python-virtualenv
-BuildRequires: rust
+BuildRequires: rust >= 1.34.0
+BuildRequires: rust-cbindgen >= 0.8.2
 BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.22.0
+BuildRequires: sqlite3-devel >= 3.28.0
 BuildRequires: startup-notification-devel >= 0.8
 BuildRequires: virtualenv
 BuildRequires: xorg-lib-libX11-devel
@@ -220,7 +226,7 @@ Requires:   dbus-glib >= 0.60
 Requires:      glib2 >= 1:2.22
 Requires:      gtk+3 >= 3.4.0
 Requires:      libpng >= 2:1.6.25
-Requires:      libvpx >= 1.5.0
+%{?with_system_libvpx:Requires:        libvpx >= 1.5.0}
 Requires:      myspell-common
 Requires:      nspr >= 1:%{nspr_ver}
 Requires:      nss >= 1:%{nss_ver}
@@ -1248,6 +1254,7 @@ unpack() {
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %build
 cp -p %{_datadir}/automake/config.* build/autoconf
@@ -1263,14 +1270,25 @@ export CXX="clang++"
 export CC="%{__cc}"
 export CXX="%{__cxx}"
 %endif
+%ifarch %{ix86}
+export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64 -g0"
+export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64 -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"
+%else
 export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
 export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64"
+%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
@@ -1285,7 +1303,6 @@ 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
@@ -1299,7 +1316,7 @@ ac_add_options --enable-crashreporter
 %else
 ac_add_options --disable-crashreporter
 %endif
-#ac_add_options --disable-elf-hack
+ac_add_options --disable-elf-hack
 ac_add_options --disable-gconf
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
@@ -1313,28 +1330,37 @@ ac_add_options --enable-ldap
 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-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --with-distribution-id=org.pld-linux
-ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
 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-zlib
-ac_add_options --with-x
 EOF
 
-AUTOCONF=/usr/bin/autoconf2_13 ./mach build -v
+%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
 
 %if %{with crashreporter}
 # create debuginfo for crash-stats.mozilla.com
@@ -1343,7 +1369,7 @@ AUTOCONF=/usr/bin/autoconf2_13 ./mach build -v
 
 %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 comm/mail/installer stage-package \
@@ -1366,11 +1392,6 @@ 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
@@ -1405,9 +1426,6 @@ if [ -d %{_libdir}/%{name}/extensions ] && [ ! -L %{_libdir}/%{name}/extensions
        fi
        mv -v %{_libdir}/%{name}/extensions %{_datadir}/%{name}/extensions
 fi
-if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
-       mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
-fi
 for d in chrome defaults icons isp modules res; do
        if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
                install -d %{_datadir}/%{name}
@@ -1418,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
@@ -1442,6 +1452,7 @@ rm -rf $HOME
 %attr(755,root,root) %{_libdir}/%{name}/liblgpllibs.so
 %{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
 %attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozwayland.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %attr(755,root,root) %{_libdir}/%{name}/*-bin
 %attr(755,root,root) %{_libdir}/%{name}/pingsender
@@ -1457,8 +1468,11 @@ rm -rf $HOME
 %{_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
@@ -1472,9 +1486,7 @@ rm -rf $HOME
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/dictionaries
 %{_libdir}/%{name}/extensions
-%{_libdir}/%{name}/hyphenation
 %{_libdir}/%{name}/isp
 
 %{_pixmapsdir}/*.png
@@ -1483,10 +1495,8 @@ rm -rf $HOME
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/isp
-
 %dir %{_datadir}/%{name}/extensions
-%{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+%{_datadir}/%{name}/isp
 
 %if %{with lightning}
 %files addon-lightning
Thunderbird - email client
This page took 0.057589 seconds and 4 git commands to generate.