X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=thunderbird.spec;h=32461f46e0ae55b3699f2885df33b50cf7a7880c;hb=55accbab6c72801a14b6d045324bda5e7f440081;hp=cbafead8499da63e85ce12e3c4bd77eb6bcf1b56;hpb=114703254fe980ce905acf20bd131ab24ae31429;p=packages%2Fthunderbird.git diff --git a/thunderbird.spec b/thunderbird.spec index cbafead..32461f4 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -8,12 +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_without gold # use default linker instead of gold +%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 @@ -24,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.7 +%define nspr_ver 4.21 +%define nss_ver 3.44.2 # The actual sqlite version (see RHBZ#480989): %define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) @@ -37,133 +40,134 @@ 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.6.1 +Version: 68.2.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: ce761c4d0f4d85c0c5ad5d1a22aa9e50 +# Source0-md5: 27f29cb3b3b6bae43e9247040ad5fa21 Source1: %{name}.desktop Source2: %{name}.sh Source100: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ar.xpi -# Source100-md5: 089bcf347554f17e463f8a70bf0c7118 +# Source100-md5: 93f3f37f4a9e121d462702da6046f998 Source101: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ast.xpi -# Source101-md5: ae32709e21f24e92d6aa4a21bbb72604 +# Source101-md5: 88fc4aeeb68cd260261e85be4f1a8e96 Source102: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/be.xpi -# Source102-md5: 310710abddc90bcaabf4aa0579f88f0e +# Source102-md5: e1e22e0e8ed7eb932b7b3f31a3032d76 Source103: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/bg.xpi -# Source103-md5: 79e6a15a1151c6c9dd8ce7963f5f6718 +# Source103-md5: 306a4149de7b0e7dfae5378619a39b08 Source104: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/br.xpi -# Source104-md5: f27637dc67f861cbed951e0b7208b605 +# Source104-md5: 9351b28eae215a0303716aa8b8c60108 Source105: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ca.xpi -# Source105-md5: 88cd8610e337b31bcdd5984fc182ada6 +# Source105-md5: 57a072807cde971049ae3ba01b538076 Source106: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cs.xpi -# Source106-md5: 59221fba6b5aa86c2ecd763da921e7f5 +# Source106-md5: 5982e0955e6d3b086e983ab89edbd59e Source107: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cy.xpi -# Source107-md5: a8ba1414a196a335a952b9c603b44c5e +# Source107-md5: dcc99c2c69578ea144c4b5d612d75df4 Source108: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/da.xpi -# Source108-md5: 3d90a00aa728aedbb09b1470e3c2ac92 +# Source108-md5: f64064ad32dd93efeb23cb6f2f638ff6 Source109: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/de.xpi -# Source109-md5: abbbd2e13e0a05406d7e22f99aa946dd +# Source109-md5: ebdc4ff11b43bf4771689c75d591bb97 Source110: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/dsb.xpi -# Source110-md5: 6d05f68c9d9961d5d4e27109b178eb04 +# Source110-md5: 300507261909d06034a565dd00b58a81 Source111: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/el.xpi -# Source111-md5: 82dd05c1cc9c22420caf0dccb54641d9 +# Source111-md5: f80d7fa3d4122b926b3126a312ee20d1 Source112: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-GB.xpi -# Source112-md5: ea983a9616700cb58201f97c4b420f05 +# Source112-md5: ff7c2043171b295a9b1ae8d1ca354578 Source113: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-US.xpi -# Source113-md5: cc241eeff8fd034f2bc67da75829cda8 +# Source113-md5: 3870fa70ec2ac7041dec7061bf5f2e09 Source114: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-AR.xpi -# Source114-md5: 57c0c02f6d9a5e7413a025e2549aab20 +# Source114-md5: a6edd8253294a4640e21785296155faf Source115: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-ES.xpi -# Source115-md5: 063e7302ac8db6677f0254fa1d75edf1 +# Source115-md5: d96e978ea27732be5939f644332ba3c9 Source116: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/et.xpi -# Source116-md5: 8d55426b864b187a1ba167f5b0a67730 +# Source116-md5: bbe675424b384b3e0029b942f3be4238 Source117: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/eu.xpi -# Source117-md5: 6cd79d1d92098e680f128dbe3569eb45 +# Source117-md5: 31ce0a903d0b7fdf1811b58253b44312 Source118: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fi.xpi -# Source118-md5: c16b20ea83a08b3abedf1be113677011 +# Source118-md5: be0d4c40032c53a2fdbdcf38eec95cbc Source119: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fr.xpi -# Source119-md5: 56900eaf54acf301a200bc9c03b91815 +# Source119-md5: 82b735dc272938175e4ee9e40fcb2c23 Source120: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fy-NL.xpi -# Source120-md5: 442051a28bf3ccdf7efc5abef3d9fa7a +# Source120-md5: fa101329dcec183d94468c748a305800 Source121: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ga-IE.xpi -# Source121-md5: 2658332f6fc1520bd7ddc59d8eccd547 +# Source121-md5: 9017d307e490130e9f289490debbdffc Source122: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gd.xpi -# Source122-md5: 3f99bd3437c91ce732236f432ad8a312 +# Source122-md5: 6d717fc8f02fd7b8e898bd9c042b0f7c Source123: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gl.xpi -# Source123-md5: 5980e8f85e3211e61e98f53bf342e155 +# Source123-md5: 1e9e1fdfd00e0eb7bbe4c8fee0108fc6 Source124: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/he.xpi -# Source124-md5: c19e8321826dce2cd6b7b60053a2a160 +# Source124-md5: 40b8506e7d5ee37c11cf3ea8375cab72 Source125: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hr.xpi -# Source125-md5: 9094c749affa8c3a0604bf8ea99f4468 +# Source125-md5: 176411621624957fe1b43cc79ef932a6 Source126: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hsb.xpi -# Source126-md5: 8741d430bf9496141c26ed9125bde1d2 +# Source126-md5: ac4067056c835bdcb9d284864fdf4cb9 Source127: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hu.xpi -# Source127-md5: 83225587982ee67deed432e96df044af +# Source127-md5: 52c6ac25d415b66223837504d6d97f22 Source128: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hy-AM.xpi -# Source128-md5: 04dee5bf634ef7a53e0065b2347451e9 +# Source128-md5: d8bc30ce5dcb3e414416867f9ba4db66 Source129: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/id.xpi -# Source129-md5: 800aaae9f72de7b06e8203be0212a7e0 +# Source129-md5: 58980c35e05e6e55a8d7a0d66c164bcd Source130: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/is.xpi -# Source130-md5: 06533d435bf8cb5c9768e26b5e03b3a7 +# Source130-md5: e2ee25ece735acb582d7c5544110209f Source131: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/it.xpi -# Source131-md5: c232a219639a25920a4c5de57e40009d +# Source131-md5: 0a5cd30dd64b4c874d1fd6d530a24ff0 Source132: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ja.xpi -# Source132-md5: 9eab99f5f5a70bf199f2de7cb0772dfa +# Source132-md5: 56407e21fc39e4e8ec631a2312cf3995 Source133: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kab.xpi -# Source133-md5: 9e1666299e8b1c31e63e0d4b1fa49522 +# Source133-md5: 4cd59c109bb395b4bb3c87c3d28e909a Source134: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kk.xpi -# Source134-md5: f12a36c257ef0604cae37cd544a5ff68 +# Source134-md5: 9c9355a0c3e9ccbe066a2dcb71b76626 Source135: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ko.xpi -# Source135-md5: 01f5c5dea42337de45aaeae9c8e60934 +# Source135-md5: ddbecb3524dc9785041bcd2f695257e5 Source136: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/lt.xpi -# Source136-md5: 93d411c0b98472a9ec13f107320c088c +# Source136-md5: 36a66838f8d922ee65f32c3801715800 Source137: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ms.xpi -# Source137-md5: 3c966c0890accf1d0bac45169b62a80f +# Source137-md5: d2ac95c018e959e27ec7a2f4ebe959ee Source138: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nb-NO.xpi -# Source138-md5: ea13ec892f1728ecd249c321c0ba79a1 +# Source138-md5: 61459be7d8ad6434b4073158f9662b1e Source139: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nl.xpi -# Source139-md5: 1054a16fd94724aec518296261e90956 +# Source139-md5: 2b2a32f85f7efe2ec41a6a89864ce212 Source140: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nn-NO.xpi -# Source140-md5: 70ed55a27373597174000eeb82bc9b3f +# Source140-md5: 19b5d92c548a2ff4b80b9ad84c8b72f5 Source141: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pl.xpi -# Source141-md5: c09728602b08a9296481eff58f96cada +# Source141-md5: 041fa32d390da92604527253d5c69456 Source142: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-BR.xpi -# Source142-md5: 80ac8536d4869dc7b51369bc3d9c8777 +# Source142-md5: 9f044634d9b56e40cb67413d04990887 Source143: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-PT.xpi -# Source143-md5: cbcc6aec44452a2193ea839fcd792e12 +# Source143-md5: 97688bf9bf853ece7eb2ed97ca32832e Source144: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/rm.xpi -# Source144-md5: 1a107c2fe9da0548d72f5e0c43876fd5 +# Source144-md5: 24149781109295eb7858b20337e87f36 Source145: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ro.xpi -# Source145-md5: aa53c22525228e556a0a9d03ce37b661 +# Source145-md5: 2f0f561bcbd8b6ff75d7fbba160ad8ed Source146: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ru.xpi -# Source146-md5: 7792746ec4fe11c6ee7b2b0849d47670 +# Source146-md5: 7b52c85368fbe77b61b329fa99b6df6a Source147: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/si.xpi -# Source147-md5: b6c5be8c608802a8c5350a87b3a3df51 +# Source147-md5: 191bb1f0781573b00f3815cc295702ba Source148: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sk.xpi -# Source148-md5: e20f37d7e91ba548a4b643d5f04eca9c +# Source148-md5: 5ff4e80ed97abae53c8e28e84a25406c Source149: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sl.xpi -# Source149-md5: fbc5aa3ca3d018df88e48c4e1ea8b311 +# Source149-md5: 7bd94b8cd486d18ac5f4b40ca7f49e5a Source150: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sq.xpi -# Source150-md5: dfc3baab59476323ac811a9cdb12bce3 +# Source150-md5: 1ae89cf5c5f8b5566af884ec77d1636e Source151: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sr.xpi -# Source151-md5: f2589d76cfd0fe7ace7a6d897ecb889d +# Source151-md5: c2e7498134c9a304d83de0615e11ad66 Source152: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sv-SE.xpi -# Source152-md5: 41ca91243f74ef785d40d092256f400b +# Source152-md5: 17b93e7fc1e212cb827040dda0e9250e Source153: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/tr.xpi -# Source153-md5: 749748bef99894898beec150b4bf77a2 +# Source153-md5: cb6180675bdc0ae5cdb4815649d4ce38 Source154: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/uk.xpi -# Source154-md5: 17745c9b02ad122b72e28f1d78d9764b +# Source154-md5: 16fc149dbe036109406a33e8cbcfb2f8 Source155: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/vi.xpi -# Source155-md5: e0aa37c63b594693e7a1c5051d54fe4c +# Source155-md5: 2a5d8b4b1d2d602b2594f576906b97c7 Source156: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-CN.xpi -# Source156-md5: c7ffbc5124e5205754e5d3b383a74e37 +# Source156-md5: 63ecaaca742ad215f33f491814c741ad Source157: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-TW.xpi -# Source157-md5: 02c3329aa7cd079d1259962ef08fda86 +# Source157-md5: 22c8bff67c279e58535c4441da0599e5 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 @@ -178,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} @@ -200,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 @@ -222,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} @@ -1250,6 +1254,7 @@ unpack() { %patch0 -p1 %patch1 -p1 %patch2 -p0 +%patch3 -p1 %build cp -p %{_datadir}/automake/config.* build/autoconf @@ -1265,8 +1270,18 @@ 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 @@ -1301,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 @@ -1321,23 +1336,22 @@ ac_add_options --enable-readline 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 +%{!?with_clang:export MOZ_MAKE_FLAGS="-j1"} + +AUTOCONF=/usr/bin/autoconf2_13 ./mach build %if %{with crashreporter} # create debuginfo for crash-stats.mozilla.com @@ -1346,7 +1360,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 \ @@ -1369,11 +1383,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 @@ -1408,9 +1417,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} @@ -1421,14 +1427,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 @@ -1445,6 +1443,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 @@ -1460,8 +1459,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 @@ -1475,9 +1477,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 @@ -1486,10 +1486,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