rpms
/
thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2023-11-29 12:37:18 +04:00
parent 7381f37a2d ab316fd76c
commit b22276289f
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.90.0-2.el8_1.src.rpm
SOURCES/nss-3.90.0-3.el9_0.src.rpm
SOURCES/thunderbird-115.4.1.processed-source.tar.xz
SOURCES/thunderbird-langpacks-115.4.1-20231025.tar.xz
SOURCES/thunderbird-115.5.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-115.5.0-20231121.tar.xz

4
.thunderbird.metadata
View File

@ -2,5 +2,5 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm
df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
02fe5168662a55fdad1abfe4537442ca9cac6f67 SOURCES/thunderbird-115.4.1.processed-source.tar.xz
7fb41ab4b51c0b38cc104092300d61fdea062de0 SOURCES/thunderbird-langpacks-115.4.1-20231025.tar.xz
5a7ac4a9bd48e160ad1fcac18f4bb2660f5672e1 SOURCES/thunderbird-115.5.0.processed-source.tar.xz
659e4bde9e34477277c3a7e6d09457cbe9340b44 SOURCES/thunderbird-langpacks-115.5.0-20231121.tar.xz

28
SPECS/thunderbird.spec
View File

@ -23,7 +23,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el8")
if match then
return 9
return 10
end
match = string.match(str, ".module%+el9.%d+")
if match then
@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
return 3
return 4
end
return -1
end}
@ -134,7 +134,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 115.4.1
Version: 115.5.0
Release: 1%{?dist}.alma.1
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -143,14 +143,19 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
ExcludeArch: %{ix86}
%endif
%if 0%{?rhel} == 8
# Started to ship on aarch64 in RHEL 8.2, on s390x in RHEL 8.3
%if %{rhel_minor_version} == 1
ExcludeArch: %{ix86} aarch64 s390x
ExcludeArch: %{ix86} s390x aarch64
%else
%if %{rhel_minor_version} == 2
ExcludeArch: %{ix86} s390x
%else
ExcludeArch: %{ix86}
%endif
%endif
%endif
%if 0%{?rhel} == 7
ExcludeArch: aarch64 s390 ppc
ExcludeArch: aarch64 s390 ppc ppc64
%endif
# We can't use the official tarball as it contains some test files that use
@ -160,7 +165,7 @@ ExcludeArch: aarch64 s390 ppc
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz
Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks}
Source1: thunderbird-langpacks-%{version}-20231025.tar.xz
Source1: thunderbird-langpacks-%{version}-20231121.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -288,7 +293,7 @@ BuildRequires: rust >= %{rust_version}
%if 0%{?rhel} == 9
BuildRequires: cargo
BuildRequires: clang clang-libs llvm
BuildRequires: clang clang-libs llvm llvm-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: python3-devel
@ -1014,8 +1019,12 @@ echo "ac_add_options --with-mozilla-api-keyfile=`pwd`/mozilla-api-key" >> .mozco
echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc-api-key" >> .mozconfig
echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig
# May result in empty --with-libclang-path= in earlier versions.
# So far this is needed only for c8s/c9s.
%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) || (0%{?rhel} == 9 && %{rhel_minor_version} >= 4)
# Clang 17 upstream's detection fails, tell it where to look.
echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
%endif
echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
@ -1505,9 +1514,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Thu Nov 02 2023 Eduard Abdullin <eabdullin@almalinux.org> - 115.4.1-1.alma.1
* Wed Nov 29 2023 Eduard Abdullin <eabdullin@almalinux.org> - 115.5.0-1.alma.1
- Debrand for AlmaLinux
* Tue Nov 21 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1
- Update to 115.5.0 build1
* Wed Oct 25 2023 Eike Rathke <erack@redhat.com> - 115.4.1-1
- Update to 115.4.1 build1