Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2024-10-03 11:15:29 +00:00 committed by eabdullin
commit f511730652
3 changed files with 15 additions and 13 deletions

8
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz 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.101.0-6.el8_2.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm
SOURCES/nss-3.101.0-6.el9_0.src.rpm SOURCES/nss-3.101.0-7.el9_2.src.rpm
SOURCES/thunderbird-128.2.0esr.processed-source.tar.xz SOURCES/thunderbird-128.3.0esr.processed-source.tar.xz
SOURCES/thunderbird-langpacks-128.2.0esr-20240905.tar.xz SOURCES/thunderbird-langpacks-128.3.0esr-20240930.tar.xz

View File

@ -1,6 +1,6 @@
5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz 5012b69e54cbebe3b5e74011dacf3a2097f49921 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
cd19fc0ba6e05b5930cfcc7c85ec8508a6d3f284 SOURCES/nss-3.101.0-6.el8_2.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm
c3665cbe283450a49ab446d3044916132f1b9699 SOURCES/nss-3.101.0-6.el9_0.src.rpm 0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm
f948436a9a257d21d94a89891151210c4b4af6c9 SOURCES/thunderbird-128.2.0esr.processed-source.tar.xz 652fe7d35f3bd3b970aca72f0504f65474f410d3 SOURCES/thunderbird-128.3.0esr.processed-source.tar.xz
9d30eea098178f20017e6f1c3dbc86e546365952 SOURCES/thunderbird-langpacks-128.2.0esr-20240905.tar.xz 007289d96493ff17951a877cd91f01fb90c1d153 SOURCES/thunderbird-langpacks-128.3.0esr-20240930.tar.xz

View File

@ -131,7 +131,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 128.2.0 Version: 128.3.0
Release: 1%{?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+
@ -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: 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}%{?pre_version}-20240905.tar.xz Source1: thunderbird-langpacks-%{version}%{?pre_version}-20240930.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -174,8 +174,8 @@ Source32: node-stdout-nonblocking-wrapper
Source35: google-loc-api-key Source35: google-loc-api-key
Source401: nss-setup-flags-env.inc Source401: nss-setup-flags-env.inc
Source402: nspr-4.35.0-1.el8_1.src.rpm Source402: nspr-4.35.0-1.el8_1.src.rpm
Source403: nss-3.101.0-6.el8_2.src.rpm Source403: nss-3.101.0-7.el8_2.src.rpm
Source404: nss-3.101.0-6.el9_0.src.rpm Source404: nss-3.101.0-7.el9_2.src.rpm
# ---- RHEL specific patches --- # ---- RHEL specific patches ---
# -- Downstream only -- # -- Downstream only --
@ -1638,9 +1638,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Thu Sep 19 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.2.0-1.alma.1 * Thu Oct 03 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.3.0-1.alma.1
- AlmaLinux changes - AlmaLinux changes
* Mon Sep 30 2024 Jan Horak <jhorak@redhat.com> - 128.3.0-1
- Update to 127.3.0
* Thu Sep 05 2024 Eike Rathke <erack@redhat.com> - 128.2.0-1 * Thu Sep 05 2024 Eike Rathke <erack@redhat.com> - 128.2.0-1
- Update to 128.2.0 - Update to 128.2.0