Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2024-05-20 10:06:29 +03:00
commit 71a2add849
3 changed files with 20 additions and 14 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/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.90.0-2.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/nss-3.90.0-3.el9_0.src.rpm
SOURCES/thunderbird-115.10.0.b2.processed-source.tar.xz SOURCES/thunderbird-115.11.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-115.10.0-20240415.tar.xz SOURCES/thunderbird-langpacks-115.11.0-20240513.tar.xz

View File

@ -2,5 +2,5 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.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 df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
56522a0800e27a5ecee0212ad55d3768bf8a7e32 SOURCES/thunderbird-115.10.0.b2.processed-source.tar.xz b49c034c5add68d6ed21941260f81ff19de310f9 SOURCES/thunderbird-115.11.0.processed-source.tar.xz
09f9395ac550f9f6974ac2f3ac5d5635b7eeab16 SOURCES/thunderbird-langpacks-115.10.0-20240415.tar.xz c7dd3c6b5bf0a940cf27e4f2cf39ba53c2156116 SOURCES/thunderbird-langpacks-115.11.0-20240513.tar.xz

View File

@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
end end
match = string.match(str, ".el9") match = string.match(str, ".el9")
if match then if match then
return 4 return 5
end end
return -1 return -1
end} end}
@ -124,7 +124,7 @@ end}
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # 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 # thunderbird-102.8.0.b2.processed-source.tar.xz
# When unset use processed source file name as is. # When unset use processed source file name as is.
%global buildnum .b2 ##global buildnum .b2
%bcond_without langpacks %bcond_without langpacks
@ -134,8 +134,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 115.10.0 Version: 115.11.0
Release: 2%{?dist}.alma.1 Release: 1%{?dist}.alma.1
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -165,7 +165,7 @@ ExcludeArch: aarch64 s390 ppc ppc64
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz #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 Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks} %if %{with langpacks}
Source1: thunderbird-langpacks-%{version}-20240415.tar.xz Source1: thunderbird-langpacks-%{version}-20240513.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -1517,12 +1517,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Wed Apr 24 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.10.0-2.alma.1 * Mon May 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.11.0-1.alma.1
- Revert expat CVE-2023-52425 - AlmaLinux changes
- Update 115.10.0.b2
* Tue Apr 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.9.0-1.alma.1 * Mon May 13 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
- Debrand for AlmaLinux - Update to 115.11.0 build2
* Mon Apr 15 2024 Eike Rathke <erack@redhat.com> - 115.10.0-2
- Update to 115.10.0 build2
* Fri Apr 12 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
- Update to 115.10.0 build1
- Revert expat CVE-2023-52425 fix
* Mon Mar 18 2024 Eike Rathke <erack@redhat.com> - 115.9.0-1 * Mon Mar 18 2024 Eike Rathke <erack@redhat.com> - 115.9.0-1
- Update to 115.9.0 build1 - Update to 115.9.0 build1