X-Git-Url: http://git.pld-linux.org/?p=packages%2Fthunderbird.git;a=blobdiff_plain;f=thunderbird.spec;h=d0d3da6665aecd587d2b8de7fffb18bc667f16e3;hp=e6f9f9be0dcec63604f141261e182cb8f90769a2;hb=1bb53eab774a7ce57313dc07ceacd8d66d068e87;hpb=317340741b189cd0f58080da651831b3a78741de diff --git a/thunderbird.spec b/thunderbird.spec index e6f9f9b..d0d3da6 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.1 # 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.5.0 +Version: 68.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: d1ff5fac4a1c6d406724b4447821b5d5 +# Source0-md5: 79fbff6edded2fce28026c617dec805c Source1: %{name}.desktop Source2: %{name}.sh Source100: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ar.xpi -# Source100-md5: 3fd03e06106d36ca1ce5a57142a568af +# Source100-md5: d5e114116a5e36856f3353f153d7bc61 Source101: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ast.xpi -# Source101-md5: 8a162897569e2190a7bd432dbe0a41bc +# Source101-md5: 2b2ac31bfb2e429f64323f35e62baf8f Source102: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/be.xpi -# Source102-md5: a4e34cb2c943f1786c8682c6611459a2 +# Source102-md5: ddf45714aa4b4f31aa396c3860b2228f Source103: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/bg.xpi -# Source103-md5: 4dd1038b3fabb354965a4e3500fe40ce +# Source103-md5: c20fc99646e5ef9f0c766d86b9da1adb Source104: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/br.xpi -# Source104-md5: 3ab665959c97e30a55513838923c0e3f +# Source104-md5: d7ce37e52ea831a4e123f970e4b3d266 Source105: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ca.xpi -# Source105-md5: 5ab69a32941df90ac776f71d07dd064b +# Source105-md5: c57d00bfcad2db63acd5f04b3aa5394e Source106: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cs.xpi -# Source106-md5: 3ef4dc5b17356390157d75dd9012b9c3 +# Source106-md5: 60ffd65ac5ccb8289adfb517a1a62dca Source107: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cy.xpi -# Source107-md5: b989d02840b79fd7155b82f41f6e0e6f +# Source107-md5: b352ccb56b4d8eefe53ca9db54ade441 Source108: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/da.xpi -# Source108-md5: 73d645e74c5dab85cb462cb1e203c5ea +# Source108-md5: b2580d68bc3696c93becb7f580896df1 Source109: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/de.xpi -# Source109-md5: 23d3f5ea5fab40ddf2994d919751148a +# Source109-md5: c6554eb16f9fba7cdcfcedc5d541b6f5 Source110: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/dsb.xpi -# Source110-md5: 9ba91afb522a443466cf14ef00a76019 +# Source110-md5: 4ac6ee426e196b3226368413179a8e6c Source111: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/el.xpi -# Source111-md5: f9298a8f6625dfca4055cca318c8f4c9 +# Source111-md5: dd31d910010462670a49a946993f5a82 Source112: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-GB.xpi -# Source112-md5: 4769d970957f5f1de020ceec93521d35 +# Source112-md5: 3ba76b86401665573f7feb53bec585cc Source113: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-US.xpi -# Source113-md5: 0d559ea3dfeca3031664918570f7f15b +# Source113-md5: afc3399baafd6dd40280146762b7e215 Source114: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-AR.xpi -# Source114-md5: 51df760547a3b09d37fcefde9469328c +# Source114-md5: 24f9ce861b8bede5feb33aab47d84ce4 Source115: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-ES.xpi -# Source115-md5: 8fc504a2bfbc2727c44e2c01a10f36da +# Source115-md5: 4eacbc0393b84e2eb3817c0c6ced62b4 Source116: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/et.xpi -# Source116-md5: 7b3f1d87534631066baed1bb6c0ef8f2 +# Source116-md5: 70074fc2361424d42b51e422f8a74ae2 Source117: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/eu.xpi -# Source117-md5: 784a42884a4f5c4b8cfa0ddb274c1c47 +# Source117-md5: 303a3c31980e3d2a88787553cdb04280 Source118: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fi.xpi -# Source118-md5: aadd42ff069c1ff431a61c57138646ce +# Source118-md5: ccddfdfa45aa87421c9e729fe771f510 Source119: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fr.xpi -# Source119-md5: 1ef73cfb62835932362f962eb6a198a5 +# Source119-md5: 140d6f3befda4f227756304317f3e279 Source120: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fy-NL.xpi -# Source120-md5: 68cb2fd52bed62ca6b4ae788c46c8fd1 +# Source120-md5: c656b1c21c64435bfbca05e2c4d462a0 Source121: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ga-IE.xpi -# Source121-md5: 1641ac7f49ce824f66c55db93f3a7be1 +# Source121-md5: 84deed1b3170bc89cf928650da717feb Source122: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gd.xpi -# Source122-md5: 0a7b3dea52051a9969b0c93b47744c62 +# Source122-md5: 7321c9f9fcd844ff4954f4e87b303bd7 Source123: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gl.xpi -# Source123-md5: de7012a998fd3b4c925569326bc660b9 +# Source123-md5: 77475473005736d8a4782ffe7303067a Source124: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/he.xpi -# Source124-md5: f53d0d0494597352c8ef656210efcd3a +# Source124-md5: 65cc42ea29a8decab59a053a4727217e Source125: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hr.xpi -# Source125-md5: 6356ebde5a405e10cc8dc3c71cf0b92b +# Source125-md5: 51f62444887a5e30804ed38b69c7acff Source126: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hsb.xpi -# Source126-md5: 6d0ff132f08d989499b67832aa19af2d +# Source126-md5: f1370c44368e674977135a79c379c798 Source127: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hu.xpi -# Source127-md5: c422d7cb7bcc551182bedfa07f19be37 +# Source127-md5: fe8b2c7631f8dd7a21504eb685ff7531 Source128: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hy-AM.xpi -# Source128-md5: 6127540796ba19808cf08bb3f58dd125 +# Source128-md5: 2d662e9d1f7e041da00010f156cdf768 Source129: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/id.xpi -# Source129-md5: 5d2d8d9baaf9f76bbc442df62320f9e3 +# Source129-md5: b13d1286a490e1116ed7980e85d5a099 Source130: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/is.xpi -# Source130-md5: 6732db0349c67493d01424addcd6702c +# Source130-md5: 8be73084b5812588158986735f71a3f3 Source131: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/it.xpi -# Source131-md5: b9a684dc114bac242d63797904061586 +# Source131-md5: e8513a35d4d7bbcaabbfd78da24db72a Source132: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ja.xpi -# Source132-md5: 393e3de2a7502222f93a286f1f565c3f +# Source132-md5: 0d64b38da764674fbb18396dc991d332 Source133: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kab.xpi -# Source133-md5: 907f39aa8325d3021c45e8e4386886ed +# Source133-md5: b2d1d5dd6a2be6e021f73003da3044a4 Source134: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kk.xpi -# Source134-md5: e38111e606aee507b2c20f2a5b2ca4aa +# Source134-md5: 962a95cfcb93aa72cc46d37b8d24d853 Source135: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ko.xpi -# Source135-md5: 2893e2c0a8f15155c1f765ef50859771 +# Source135-md5: 9da478aee2b85aa1af91d4adde523860 Source136: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/lt.xpi -# Source136-md5: b78a7573f7a1ce721e0af4d38623b721 +# Source136-md5: d53cadbd712b26134b333a2c2540c0a3 Source137: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ms.xpi -# Source137-md5: 4306f39023afcde43c0dd90e2c7712c4 +# Source137-md5: ec17a19acd79bdf956d3f0df67c8d381 Source138: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nb-NO.xpi -# Source138-md5: 254b6e510adb38a65f891a262c3876e4 +# Source138-md5: ff43e00a84325083b1eab08744e0c473 Source139: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nl.xpi -# Source139-md5: 8507c400d7fd568b8528e5df27aaeb8f +# Source139-md5: a5d721f6b688d57074dd39ef95e2a6cf Source140: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nn-NO.xpi -# Source140-md5: ebfe5bd4259b09d584cf3a8d48b2e63a +# Source140-md5: acfcb526762615d5cb7570b49b147537 Source141: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pl.xpi -# Source141-md5: 9f00ceaf205e6cdf50859e13ae3c6043 +# Source141-md5: 0564c146722bae34ad39efd801eff587 Source142: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-BR.xpi -# Source142-md5: 370424cc707f24ad909ef8ce300023c6 +# Source142-md5: 72a8bc3dbda72559437efc12caecb8e8 Source143: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-PT.xpi -# Source143-md5: 739505b4c70af6e0b5432c52cfdf30e3 +# Source143-md5: 8f09353c5b9e69f995b6737862979dec Source144: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/rm.xpi -# Source144-md5: 7deedd52ecefcb1c9865dce8899d3e77 +# Source144-md5: 3c7e21574546f6bc11f6cfaac4416893 Source145: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ro.xpi -# Source145-md5: 05c170a4c04072be9abbeed437486686 +# Source145-md5: ee7293b221c8d32d76bae90b87734561 Source146: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ru.xpi -# Source146-md5: 0ca481694c2a7c4865e15e304fa6cf82 +# Source146-md5: 7357452581604895bae66088fa3ef54e Source147: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/si.xpi -# Source147-md5: 53ccf7beec8556eb0280295f7eac0d34 +# Source147-md5: 5e12bef0bc2a742a22ca6b8babb13fa5 Source148: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sk.xpi -# Source148-md5: dfb4ca8cb9d35053c24caf2de71d89c0 +# Source148-md5: 67cdb3d53d79af83a5fa19b8467f67a4 Source149: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sl.xpi -# Source149-md5: 239f12e67a754ca7bd5b63b39a1f0792 +# Source149-md5: 72f988b4997bef2c8aa1a13b3968ba60 Source150: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sq.xpi -# Source150-md5: 1c1dd8dc92ce6fa65cab91cb9343fa9d +# Source150-md5: fba648aacaf1f623262d2d2ae7b67553 Source151: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sr.xpi -# Source151-md5: 46b3839ba2633b815eac459a9d468a78 +# Source151-md5: 80a3e322da3c9359483347c9469ddd67 Source152: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sv-SE.xpi -# Source152-md5: f5d266cda789aba87f66dfa4c3635b4e +# Source152-md5: ef7617e052a45d2864dd9bebc22c74ad Source153: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/tr.xpi -# Source153-md5: 2a9aa333f50f83e85fcb7f36ffbb27f4 +# Source153-md5: 2d239b6eb141d30d6f60b603459a8e6a Source154: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/uk.xpi -# Source154-md5: 07c7c4fb8794c4a6c07caa25d402d5db +# Source154-md5: 3c16e9c798c6289855daad0c28568fe0 Source155: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/vi.xpi -# Source155-md5: 116c4ade04a20979ce74ff08a8ff267d +# Source155-md5: d6552117e8bf0da91d32af77d278da50 Source156: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-CN.xpi -# Source156-md5: 9b92f0f33b79de161c903cb80cbcf7bd +# Source156-md5: b3fde48e00cb3c7a4ce2e59e5afc4fde Source157: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-TW.xpi -# Source157-md5: da456467c61d1d90e691942d658ec6ab +# Source157-md5: dadb95754415a28ad5e5a7818e2edb5d 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} @@ -1445,6 +1451,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 +1467,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 +1485,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 @@ -1488,9 +1496,6 @@ rm -rf $HOME %{_datadir}/%{name}/defaults %{_datadir}/%{name}/isp -%dir %{_datadir}/%{name}/extensions -%{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi - %if %{with lightning} %files addon-lightning %defattr(644,root,root,755)