rpms/thunderbird
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Bundled freetype2 removal and fixing icons flatpak in appdata

Browse Source 
- Freetype2 removed from the sources to avoid bundling it.
- appdata for flatpak does not need to contain the <icon> tag to
  specify the icon name - the name is correct already as
  org.mozilla.Thunderbird.png

Related: RHEL-84220
This commit is contained in:
Jan Horak 2025-03-26 13:58:00 +01:00 committed by Eike Rathke
parent 3e19f39142
commit b9fc3bcd06
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
process-official-tarball
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 -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* 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} processed_tarball=${1/source/processed-source}
cd ./process-tarball-dir cd ./process-tarball-dir

7
thunderbird.spec
View File

@ -380,7 +380,6 @@ Provides: bundled(fathom)
Provides: bundled(fdlibm) Provides: bundled(fdlibm)
Provides: bundled(ffvpx) Provides: bundled(ffvpx)
Provides: bundled(fluent.migratetb) Provides: bundled(fluent.migratetb)
Provides: bundled(freetype2)
Provides: bundled(function2) Provides: bundled(function2)
Provides: bundled(gbm) Provides: bundled(gbm)
Provides: bundled(gemmology) Provides: bundled(gemmology)
@ -1555,7 +1554,13 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
# Register as an application to be visible in the software center # Register as an application to be visible in the software center
mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo 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 %{__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" sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
%endif
# Clean the created bundled rpms. # Clean the created bundled rpms.
rm -rf %{_srcrpmdir}/libffi*.src.rpm rm -rf %{_srcrpmdir}/libffi*.src.rpm