Import from CS git

This commit is contained in:
eabdullin 2025-04-24 13:23:56 +00:00
parent f47f82f4ad
commit 8cdcbf0e12
4 changed files with 23 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.8.0esr.b5.processed-source.tar.xz
SOURCES/thunderbird-langpacks-128.8.0esr-20250305.tar.xz
SOURCES/thunderbird-128.9.0esr.b3.processed-source.tar.xz
SOURCES/thunderbird-langpacks-128.9.0esr-20250331.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
8955e13840fddf646f9c757f5de36b70d779ef7a SOURCES/thunderbird-128.8.0esr.b5.processed-source.tar.xz
ba34b6b0424176a33d4e6d734860c4d70ce17876 SOURCES/thunderbird-langpacks-128.8.0esr-20250305.tar.xz
b4f7526d7baa396cc2192e8be5398820f1d82f5c SOURCES/thunderbird-128.9.0esr.b3.processed-source.tar.xz
dce65d96b9f450834dc390691f46c4f3cbf31dff SOURCES/thunderbird-langpacks-128.9.0esr-20250331.tar.xz

View File

@ -20,6 +20,9 @@ rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS
rm -vf ./process-tarball-dir/*/comm/third_party/rust/idna/tests/IdnaTestV2.txt
rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confusing*
# We uses system freetype2
rm -vrf ./process-tarball-dir/*/modules/freetype2
processed_tarball=${1/source/processed-source}
cd ./process-tarball-dir

View File

@ -127,7 +127,7 @@ end}
# 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 .b5
%global buildnum .b3
%bcond_without langpacks
@ -137,7 +137,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 128.8.0
Version: 128.9.0
Release: 2%{?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}-20250305.tar.xz
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250331.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -380,7 +380,6 @@ Provides: bundled(fathom)
Provides: bundled(fdlibm)
Provides: bundled(ffvpx)
Provides: bundled(fluent.migratetb)
Provides: bundled(freetype2)
Provides: bundled(function2)
Provides: bundled(gbm)
Provides: bundled(gemmology)
@ -1557,7 +1556,13 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
# Register as an application to be visible in the software center
mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
%if 0%{?flatpak}
# don't specify icon for flatpak appdata, icons are correctly named and packaged already
# as org.mozilla.Thunderbird.png
sed -i -e 's|<icon .*||' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
%else
sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
%endif
# Clean the created bundled rpms.
rm -rf %{_srcrpmdir}/libffi*.src.rpm
@ -1635,6 +1640,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%{mozappdir}/glxtest
%{mozappdir}/vaapitest
%{mozappdir}/interesting_serverknobs.json
%if !%{?system_nss}
%exclude %{mozappdir}/libnssckbi.so
@ -1654,6 +1660,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Mon Mar 31 2025 Eike Rathke <erack@redhat.com> - 128.9.0-2
- Update to 128.9.0 build3
* Wed Mar 26 2025 Eike Rathke <erack@redhat.com> - 128.9.0-1
- Update to 128.9.0 build1
* Wed Mar 05 2025 Eike Rathke <erack@redhat.com> - 128.8.0-2
- Update to 128.8.0 build5