From 7446defae6794cfab4511c89479c158d2555a70f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 6 Jun 2025 11:10:01 +0300 Subject: [PATCH 1/2] Import CS git --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SPECS/thunderbird.spec | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b676fad..928b508 100644 --- a/.gitignore +++ b/.gitignore @@ -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.10.1esr.processed-source.tar.xz -SOURCES/thunderbird-langpacks-128.10.1esr-20250519.tar.xz +SOURCES/thunderbird-128.11.0esr.processed-source.tar.xz +SOURCES/thunderbird-langpacks-128.11.0esr-20250526.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index d4ace2c..4a13fc8 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -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 -407098958ae0f76477e28ce403eb5516ebd749d6 SOURCES/thunderbird-128.10.1esr.processed-source.tar.xz -a5d70710041ab551e910e2edc8a07ed54c428298 SOURCES/thunderbird-langpacks-128.10.1esr-20250519.tar.xz +ba02f98bc50c2a17860aa234dbcd470e97468b3a SOURCES/thunderbird-128.11.0esr.processed-source.tar.xz +ad0b99a96298b84d2ac52e1eecf7bb44cafa6f94 SOURCES/thunderbird-langpacks-128.11.0esr-20250526.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 42fd592..fecea8a 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -137,7 +137,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.10.1 +Version: 128.11.0 Release: 1%{?dist} 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}-20250519.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250526.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1071,9 +1071,7 @@ echo "--------------------------------------------" %patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem %patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem %endif -%if 0%{?rhel} == 8 %patch -P14 -p1 -b .cargo-lock-version -%endif # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092 @@ -1660,6 +1658,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon May 26 2025 Eike Rathke - 128.11.0-1 +- Update to 128.11.0 + * Mon May 19 2025 Eike Rathke - 128.10.1-1 - Update to 128.10.1 @@ -2005,4 +2006,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Wed Jul 3 2019 Martin Stransky - 60.7.2-3 - Rebuild to fix rhbz#1725919 - Thunderbird fails to authenticate with gmail with ssl/tls and OAuth2. - From 3b930dd5fa0bf62cf7598ea78ee30fbbad2e150e Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 2 Jul 2025 16:23:45 +0000 Subject: [PATCH 2/2] import CS thunderbird-128.12.0-1.el9 --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SPECS/thunderbird.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 928b508..18401f9 100644 --- a/.gitignore +++ b/.gitignore @@ -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.11.0esr.processed-source.tar.xz -SOURCES/thunderbird-langpacks-128.11.0esr-20250526.tar.xz +SOURCES/thunderbird-128.12.0esr.processed-source.tar.xz +SOURCES/thunderbird-langpacks-128.12.0esr-20250630.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 4a13fc8..ee3b36d 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -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 -ba02f98bc50c2a17860aa234dbcd470e97468b3a SOURCES/thunderbird-128.11.0esr.processed-source.tar.xz -ad0b99a96298b84d2ac52e1eecf7bb44cafa6f94 SOURCES/thunderbird-langpacks-128.11.0esr-20250526.tar.xz +0d3055dcd7382983cdbaab34b64fdddf23accda9 SOURCES/thunderbird-128.12.0esr.processed-source.tar.xz +f4fd598826cc45aabe817a33e93bdd30db0cafce SOURCES/thunderbird-langpacks-128.12.0esr-20250630.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index fecea8a..f49afd3 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -137,7 +137,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.11.0 +Version: 128.12.0 Release: 1%{?dist} 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}-20250526.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250630.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1658,6 +1658,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Jun 30 2025 Eike Rathke - 128.12.0-1 +- Update to 128.12.0 build1 + * Mon May 26 2025 Eike Rathke - 128.11.0-1 - Update to 128.11.0 @@ -2006,3 +2009,4 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Wed Jul 3 2019 Martin Stransky - 60.7.2-3 - Rebuild to fix rhbz#1725919 - Thunderbird fails to authenticate with gmail with ssl/tls and OAuth2. +