Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2024-12-03 11:36:09 +03:00
commit a3f5aeacc3
3 changed files with 11 additions and 8 deletions

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.101.0-7.el8_2.src.rpm
SOURCES/nss-3.101.0-7.el9_2.src.rpm
SOURCES/thunderbird-128.4.0esr.processed-source.tar.xz
SOURCES/thunderbird-langpacks-128.4.0esr-20241028.tar.xz
SOURCES/thunderbird-128.5.0esr.processed-source.tar.xz
SOURCES/thunderbird-langpacks-128.5.0esr-20241126.tar.xz

View File

@ -2,5 +2,5 @@
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm
0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm
a084840a65ebe0e3d1884196b4a0dc27115b1320 SOURCES/thunderbird-128.4.0esr.processed-source.tar.xz
76c4b27c29f49f5b3eb752bf5486394a0469e8d2 SOURCES/thunderbird-langpacks-128.4.0esr-20241028.tar.xz
3f5419cc7683699cbb69b1c6352cbfe8540498c4 SOURCES/thunderbird-128.5.0esr.processed-source.tar.xz
30913e9460b7d1ed6c9032c576442bd0fa0176e8 SOURCES/thunderbird-langpacks-128.5.0esr-20241126.tar.xz

View File

@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
return 5
return 6
end
match = string.match(str, ".el10_%d+")
if match then
@ -131,7 +131,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 128.4.0
Version: 128.5.0
Release: 1%{?dist}.alma.1
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -159,7 +159,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}-20241028.tar.xz
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20241126.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -1638,9 +1638,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Mon Nov 04 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.4.0-1.alma.1
* Tue Dec 03 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.5.0-1.alma.1
- AlmaLinux changes
* Tue Nov 26 2024 Eike Rathke <erack@redhat.com> - 128.5.0-1
- Update to 128.5.0 build1
* Mon Oct 28 2024 Eike Rathke <erack@redhat.com> - 128.4.0-1
- Update to 128.4.0 build1