The package rpms/thunderbird.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/thunderbird.git/commit/?id=c50dfcd97....
Change: -%ifarch %{arm} %{ix86}
Thanks.
Full change: ============
commit bb31bb44f795ac868c549f0a399c890d02450874 Author: Jan Horak jhorak@redhat.com Date: Mon Aug 23 13:44:06 2021 +0200
Update to 91.0.2
diff --git a/.gitignore b/.gitignore index c44b9e4..ba5d6d5 100644 --- a/.gitignore +++ b/.gitignore @@ -331,3 +331,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-langpacks-78.11.0-20210602.tar.xz /thunderbird-78.12.0.source.tar.xz /thunderbird-langpacks-78.12.0-20210721.tar.xz +/thunderbird-91.0.2.source.tar.xz +/thunderbird-langpacks-91.0.2-20210823.tar.xz diff --git a/sources b/sources index 2ac88d1..d0dcb99 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (thunderbird-78.12.0.source.tar.xz) = 8a9275f6a454b16215e9440d8b68926e56221dbb416f77ea0cd0a42853bdd26f35514e792564879c387271bd43d8ee966577f133f8ae7781f43e8bec9ab78696 -SHA512 (thunderbird-langpacks-78.12.0-20210721.tar.xz) = 3905fee11ad6c5b468d95a55bf3200a4be30b1d87a00b77945962873a9567b2a1a7e9ab78ac902f75cbbcb722c4579044f6699353c1a7e39e175bfc530dbd318 -SHA512 (cbindgen-vendor-0.14.3.tar.xz) = 33c8d28547674121f690eea0d3ebac33926a39caacac787bf8ed8b346478822e74da5a4a1f57ab4df4105fa8376739a2ece888845a85bc5712aaed20e4a508bc +SHA512 (thunderbird-91.0.2.source.tar.xz) = 468be2f5024fd32eb22a661ed5f30de5d74231ee736e6743a9fb84e747bf45fceaaf286a5cbb20eb41f8ab98e0c56310eab3d2e6077fd81ee0ef52b28c33a3f2 +SHA512 (thunderbird-langpacks-91.0.2-20210823.tar.xz) = 23f9b1087ef11d79dbee4c906e1c70c1a16abc4f83278f0f30da8b2fdda55d699c98199a0ecccf3298239b68f93e2b8ce4fcbb34f7babfd0c73da63478d16d7c +SHA512 (cbindgen-vendor.tar.xz) = cb6a75b50e598aa686c42ca3927a15f4a6595c074a0dc2ac3c5768658666b55f7f42f3fb8cadabaabe509537bca62102c71017ffa1526c4daa0e7732ee476724 diff --git a/thunderbird.spec b/thunderbird.spec index dd41faf..34f2070 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -89,16 +89,16 @@ ExcludeArch: s390x
Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.0 +Version: 91.0.2 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%7Bversion%7D%%7B?pre_... %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20210816.tar.xz +Source1: thunderbird-langpacks-%{version}-20210823.tar.xz %endif Source3: get-calendar-langpacks.sh -Source4: cbindgen-vendor-0.14.3.tar.xz +Source4: cbindgen-vendor.tar.xz
Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded @@ -766,6 +766,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #===============================================================================
%changelog +* Mon Aug 23 2021 Jan Horak jhorak@redhat.com - 91.0.2-1 +- Update to 91.0.2 build1 + * Mon Aug 16 2021 Jan Horak jhorak@redhat.com - 91.0-1 - Update to 91.0 build1
commit c50dfcd979af6ba045a7c9892bb9cbd704c1b0f3 Author: Jan Horak jhorak@redhat.com Date: Mon Aug 23 13:33:18 2021 +0200
Update to 91.0
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch deleted file mode 100644 index 0856e5c..0000000 --- a/build-disable-elfhack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up thunderbird-68.0/toolkit/moz.configure.elfhack thunderbird-68.0/toolkit/moz.configure ---- thunderbird-68.0/toolkit/moz.configure.elfhack 2019-08-29 16:33:28.491708653 +0200 -+++ thunderbird-68.0/toolkit/moz.configure 2019-08-29 16:33:58.019805525 +0200 -@@ -1130,7 +1130,7 @@ with only_when('--enable-compile-environ - help='{Enable|Disable} elf hacks') - - set_config('USE_ELF_HACK', -- depends_if('--enable-elf-hack')(lambda _: True)) -+ depends_if('--enable-elf-hack')(lambda _: False)) - - - @depends(check_build_environment) diff --git a/build-python3.10.patch b/build-python3.10.patch deleted file mode 100644 index 40766b3..0000000 --- a/build-python3.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up thunderbird-78.12.0/python/mach/mach/main.py.python3.10 thunderbird-78.12.0/python/mach/mach/main.py ---- thunderbird-78.12.0/python/mach/mach/main.py.python3.10 2021-07-27 08:10:52.680466611 +0200 -+++ thunderbird-78.12.0/python/mach/mach/main.py 2021-07-27 08:11:17.377561233 +0200 -@@ -16,7 +16,7 @@ import os - import sys - import traceback - import uuid --from collections import Iterable -+from collections.abc import Iterable - - from six import string_types - diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig index 15ae03d..8dd4122 100644 --- a/thunderbird-mozconfig +++ b/thunderbird-mozconfig @@ -1,23 +1,39 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=comm/mail -mk_add_options AUTOCONF=autoconf-2.13
-ac_add_options --enable-default-toolkit=cairo-gtk3-wayland - -ac_add_options --prefix="$PREFIX" -ac_add_options --libdir="$LIBDIR" -ac_add_options --with-system-jpeg ac_add_options --with-system-zlib -ac_add_options --with-system-libvpx -ac_add_options --disable-tests ac_add_options --disable-strip -# temporary disable system cairo, because compilation fails -ac_add_options --disable-necko-wifi +#ac_add_options --enable-libnotify +ac_add_options --enable-necko-wifi ac_add_options --disable-updater -ac_add_options --with-system-icu +ac_add_options --enable-chrome-format=omni +ac_add_options --enable-pulseaudio +ac_add_options --enable-av1 +ac_add_options --without-system-icu +ac_add_options --enable-release +ac_add_options --update-channel=release +ac_add_options --allow-addon-sideload +ac_add_options --enable-js-shell +ac_add_options --with-unsigned-addon-scopes=app,system + + + + +#mk_add_options AUTOCONF=autoconf-2.13 + +#ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
-# lightning related -ac_add_options --enable-calendar +#ac_add_options --prefix="$PREFIX" +#ac_add_options --libdir="$LIBDIR" +#ac_add_options --with-system-jpeg +#ac_add_options --with-system-zlib +#ac_add_options --with-system-libvpx +#ac_add_options --disable-tests +#ac_add_options --disable-strip +## temporary disable system cairo, because compilation fails +#ac_add_options --disable-necko-wifi +#ac_add_options --disable-updater +#ac_add_options --with-system-icu
export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/thunderbird.spec b/thunderbird.spec index e889fa2..dd41faf 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -89,13 +89,13 @@ ExcludeArch: s390x
Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 78.12.0 -Release: 2%{?dist} +Version: 91.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%7Bversion%7D%%7B?pre_... %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20210721.tar.xz +Source1: thunderbird-langpacks-%{version}-20210816.tar.xz %endif Source3: get-calendar-langpacks.sh Source4: cbindgen-vendor-0.14.3.tar.xz @@ -119,11 +119,9 @@ Patch417: build-aarch64-user_vfp.patch Patch418: mozilla-1512162.patch Patch419: bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch Patch103: rhbz-1219542-s390-build.patch -Patch104: build-python3.10.patch
# PPC fix Patch304: mozilla-1245783.patch -Patch307: build-disable-elfhack.patch
# Fedora specific patches
@@ -154,7 +152,7 @@ BuildRequires: libjpeg-devel BuildRequires: zip BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: libIDL-devel +#BuildRequires: libIDL-devel BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: krb5-devel @@ -175,7 +173,7 @@ BuildRequires: libffi-devel %endif BuildRequires: startup-notification-devel BuildRequires: alsa-lib-devel -BuildRequires: autoconf213 +#BuildRequires: autoconf213 BuildRequires: desktop-file-utils BuildRequires: libcurl-devel BuildRequires: mesa-libGL-devel @@ -266,7 +264,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%if 0%{?fedora} >= 35 # since python3.10 we need to use `from collections.abc` instead of `from collections`. -%patch104 -p1 -b .python3.10 %endif
%patch304 -p1 -b .1245783 @@ -281,14 +278,13 @@ debug %{name}, you want to install %{name}-debuginfo instead. %ifarch %{arm} %patch415 -p1 -b .mozilla-1238661 %endif -%patch416 -p1 -b .SIOCGSTAMP +#FIXME %patch416 -p1 -b .SIOCGSTAMP %patch417 -p1 -b .aarch64-user_vfp %patch418 -p1 -b .mozbz-1512162 # most likely fixed #%patch419 -p1 -b .bindgen
%if 0%{?disable_elfhack} -%patch307 -p1 -b .elfhack %endif #cd ..
@@ -458,8 +454,6 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security # Workaround for mozbz#1531309 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//') %endif -# Disable null pointer gcc6 optimization (rhbz#1311886) -MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks" # Use hardened build? %if %{?hardened_build} MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" @@ -489,39 +483,38 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory" echo "ac_add_options --enable-linker=gold" >> .mozconfig %endif %endif - +%if 0%{?flatpak} +# Make sure the linker can find libraries in /app/lib64 as we don't use +# __global_ldflags that normally sets this. +MOZ_LINK_FLAGS="$MOZ_LINK_FLAGS -L%{_libdir}" +%endif +%ifarch %{arm} %{ix86} %{s390x} +export RUSTFLAGS="-Cdebuginfo=0" +%endif # We don't want thunderbird to use CK_GCM_PARAMS_V3 in nss MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
- -export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'` -export CXXFLAGS=$MOZ_OPT_FLAGS -export LDFLAGS=$MOZ_LINK_FLAGS - -export PREFIX='%{_prefix}' -export LIBDIR='%{_libdir}' - -%ifarch %{arm} %{ix86} -export RUSTFLAGS="-Cdebuginfo=0" -%endif +echo "export CFLAGS="$MOZ_OPT_FLAGS"" >> .mozconfig +echo "export CXXFLAGS="$MOZ_OPT_FLAGS"" >> .mozconfig +echo "export LDFLAGS="$MOZ_LINK_FLAGS"" >> .mozconfig
%if 0%{?build_with_clang} -export LLVM_PROFDATA="llvm-profdata" -export AR="llvm-ar" -export NM="llvm-nm" -export RANLIB="llvm-ranlib" +echo "export LLVM_PROFDATA="llvm-profdata"" >> .mozconfig +echo "export AR="llvm-ar"" >> .mozconfig +echo "export NM="llvm-nm"" >> .mozconfig +echo "export RANLIB="llvm-ranlib"" >> .mozconfig echo "ac_add_options --enable-linker=lld" >> .mozconfig %else -export CC=gcc -export CXX=g++ -export AR="gcc-ar" -export NM="gcc-nm" -export RANLIB="gcc-ranlib" +echo "export CC=gcc" >> .mozconfig +echo "export CXX=g++" >> .mozconfig +echo "export AR="gcc-ar"" >> .mozconfig +echo "export NM="gcc-nm"" >> .mozconfig +echo "export RANLIB="gcc-ranlib"" >> .mozconfig %endif - %if 0%{?build_with_pgo} echo "ac_add_options MOZ_PGO=1" >> .mozconfig -echo "ac_add_options --enable-lto" >> .mozconfig +# PGO build doesn't work with ccache +export CCACHE_DISABLE=1 %endif
MOZ_SMP_FLAGS=-j1 @@ -538,7 +531,7 @@ MOZ_SMP_FLAGS=-j1
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export STRIP=/bin/true -./mach build +./mach build -v
# create debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} @@ -773,6 +766,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #===============================================================================
%changelog +* Mon Aug 16 2021 Jan Horak jhorak@redhat.com - 91.0-1 +- Update to 91.0 build1 + * Fri Jul 23 2021 Fedora Release Engineering releng@fedoraproject.org - 78.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild