From 597c15f4bfec98448c5b712e812552805b5eb243 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 7 Aug 2023 19:06:08 +0000 Subject: [PATCH 1/2] import CS thunderbird-102.14.0-1.el8 --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SPECS/thunderbird.spec | 11 +++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index eb723f7..44e3840 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nss-3.79.0-11.el8_1.src.rpm -SOURCES/thunderbird-102.13.0.b2.processed-source.tar.xz -SOURCES/thunderbird-langpacks-102.13.0-20230707.tar.xz +SOURCES/thunderbird-102.14.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-102.14.0-20230801.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 338a925..3581179 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,5 +1,5 @@ 2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm -7d2ee2fbb3f527e7062e32a1f13b06177c8a3cf3 SOURCES/thunderbird-102.13.0.b2.processed-source.tar.xz -cdf9e5ddff298c2b5690456a66c3868a44a382b3 SOURCES/thunderbird-langpacks-102.13.0-20230707.tar.xz +89013bc0b70898d9c6b01c02ee5cbe33d997c3fa SOURCES/thunderbird-102.14.0.processed-source.tar.xz +c1ac400105f00a4b51914c71fde446d2b4007351 SOURCES/thunderbird-langpacks-102.14.0-20230801.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index fca5603..bb1cd3a 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -183,8 +183,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.13.0 -Release: 2%{?dist} +Version: 102.14.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -192,7 +192,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # 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 .b2 +#%%global buildnum .b2 %if 0%{?rhel} == 9 ExcludeArch: %{ix86} @@ -211,7 +211,7 @@ ExcludeArch: aarch64 s390 ppc #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 %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20230707.tar.xz +Source1: thunderbird-langpacks-%{version}-20230801.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1275,6 +1275,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Aug 01 2023 Eike Rathke - 102.14.0-1 +- Update to 102.14.0 build1 + * Fri Jul 07 2023 Eike Rathke - 102.13.0-2 - Update to 102.13.0 build2 From 55186d3c619e7874fe728c4a1c38d1986bc26eab Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 5 Sep 2023 19:19:11 +0000 Subject: [PATCH 2/2] import CS thunderbird-102.15.0-1.el8 --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SPECS/thunderbird.spec | 13 +++++++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 44e3840..cae040b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nss-3.79.0-11.el8_1.src.rpm -SOURCES/thunderbird-102.14.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-102.14.0-20230801.tar.xz +SOURCES/thunderbird-102.15.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-102.15.0-20230828.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 3581179..ee564f1 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,5 +1,5 @@ 2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm -89013bc0b70898d9c6b01c02ee5cbe33d997c3fa SOURCES/thunderbird-102.14.0.processed-source.tar.xz -c1ac400105f00a4b51914c71fde446d2b4007351 SOURCES/thunderbird-langpacks-102.14.0-20230801.tar.xz +328b34b1c10a251a49ff7c047fb09f4195a2894f SOURCES/thunderbird-102.15.0.processed-source.tar.xz +0dd2e6ee4bda9d8faa77c0e7ead56a84c5f62a96 SOURCES/thunderbird-langpacks-102.15.0-20230828.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index bb1cd3a..60efb35 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -183,7 +183,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.14.0 +Version: 102.15.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -211,7 +211,7 @@ ExcludeArch: aarch64 s390 ppc #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 %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20230801.tar.xz +Source1: thunderbird-langpacks-%{version}-20230828.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1275,6 +1275,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Aug 28 2023 Eike Rathke - 102.15.0-1 +- Update to 102.15.0 build1 + +* Wed Aug 09 2023 Eike Rathke - 102.14.0-3 +- Bump NVR to rebuild + +* Wed Aug 09 2023 Jan Horak - 102.14.0-2 +- Rebuild due to rhbz#2228948 + * Tue Aug 01 2023 Eike Rathke - 102.14.0-1 - Update to 102.14.0 build1