AlmaLinux changes

This commit is contained in:
Eduard Abdullin 2025-05-06 03:48:54 +00:00 committed by root
commit f35b2e08f0
3 changed files with 22 additions and 11 deletions

4
.gitignore vendored
View File

@ -146,3 +146,7 @@
/thunderbird-langpacks-128.8.0esr-20250305.tar.xz
/thunderbird-128.9.0esr.processed-source.tar.xz
/thunderbird-langpacks-128.9.0esr-20250326.tar.xz
/thunderbird-128.9.2esr.processed-source.tar.xz
/thunderbird-langpacks-128.9.2esr-20250416.tar.xz
/thunderbird-128.10.0esr.processed-source.tar.xz
/thunderbird-langpacks-128.10.0esr-20250428.tar.xz

View File

@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f
SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68
SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
SHA512 (thunderbird-128.9.0esr.b3.processed-source.tar.xz) = 445e2895574e121216467ef9d27f7fc287180257afdbb58e6b1a333dc9d26afaacacbf22588192c9ce31a84895b89998f7285eed154f458b61cf3ad9ddf9fb8d
SHA512 (thunderbird-langpacks-128.9.0esr-20250331.tar.xz) = 0d80d78e4ba833bf6b3c66e89dc88d65fa3a66332acfc4dd984a63e39f477061c5e49d06ac81f3d0c30a96fcfb3111cb0ee075efda7077d645c31cc08dd27d96
SHA512 (thunderbird-128.10.0esr.processed-source.tar.xz) = e1c886a2992a4f5c807e707383a6d88b3fa36b233c9d6f0db3f051953ab38f4bfd012648f46333fa0a7fe45672e3ac558038c230d1c963b13093d0cc5e5cbe07
SHA512 (thunderbird-langpacks-128.10.0esr-20250428.tar.xz) = 12e5b4a619d9a08e38fb0de77d2a9ba6ca96cb4fd22529e313d09030e8c5498c00cded08b66dd7bc78789912b9e7d5865bbea0297e6703613c99caaf4de0ae06

View File

@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
return 6
return 7
end
match = string.match(str, ".el10_%d+")
if match then
@ -43,7 +43,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el10")
if match then
return 0
return 1
end
return -1
end}
@ -88,7 +88,7 @@ end}
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
%global use_gcc_ts 1
%if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
%if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
# clang depends on gcc-toolset-14-gcc-c++
%global gts_version 14
%else
@ -127,7 +127,7 @@ end}
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
# thunderbird-102.8.0.b2.processed-source.tar.xz
# When unset use processed source file name as is.
%global buildnum .b3
#%%global buildnum .b2
%bcond_without langpacks
@ -137,8 +137,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 128.9.0
Release: 2%{?dist}.alma.1
Version: 128.10.0
Release: 1%{?dist}.alma.1
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -165,7 +165,7 @@ ExcludeArch: %{ix86}
#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}%{?pre_version}-20250331.tar.xz
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250428.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -333,8 +333,9 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
BuildRequires: gcc-toolset-%{gts_version}-binutils
BuildRequires: gcc-toolset-%{gts_version}-gcc
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-g++ instead fail
# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
# when clang is upgraded to depend on a later toolset and adjust version.
# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
%endif
%if %{?use_openssl_for_librnp}
@ -1658,9 +1659,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Tue Apr 15 2025 Eduard Abdullin <eabdullin@almalinux.org> - 128.9.0-2.alma.1
* Tue May 06 2025 Eduard Abdullin <eabdullin@almalinux.org> - 128.10.0-1.alma.1
- AlmaLinux changes
* Mon Apr 28 2025 Eike Rathke <erack@redhat.com> - 128.10.0-1
- Update to 128.10.0 build1
* Wed Apr 16 2025 Eike Rathke <erack@redhat.com> - 128.9.2-1
- Update to 128.9.2
* Mon Mar 31 2025 Eike Rathke <erack@redhat.com> - 128.9.0-2
- Update to 128.9.0 build3