From 2066dfa439a3c52802102e18f25abbfe71ae6153 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 11 Aug 2021 10:30:38 +0200 Subject: [PATCH] Related: #1990543 package features/*.xpi only if any exist 78.13.0 removed the last and one and only comm/mail/components/cloudfile/wetransfer/ so %files for %{mozappdir}/features/*.xpi failed with No such file --- thunderbird.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index 38e3541..c9695ca 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -171,6 +171,7 @@ end} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/distribution/extensions %global tarballdir %{name}-%{version} +%global mozappfeatures %{mozappdir}/features/*.xpi #global pre_tag alpha %global official_branding 1 @@ -1193,6 +1194,14 @@ echo "Adding following langpacks:" cat %{name}.lang %endif +# Install feature extensions. +echo > %{name}.features +if [ -f "$(ls -1 %{mozappfeatures} | head -1)" ]; then + ls -1 %{mozappfeatures} >> %{name}.features + echo "Adding following features:" + cat %{name}.features +fi + # Get rid of devel package and its debugsymbols %{__rm} -rf %{buildroot}%{_libdir}/%{name}-devel-%{version} @@ -1253,7 +1262,7 @@ update-desktop-database &> /dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== -%files -f %{name}.lang +%files -f %{name}.lang -f %{name}.features %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/thunderbird %attr(644,root,root) %{_datadir}/applications/thunderbird.desktop @@ -1276,7 +1285,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/*.so %{mozappdir}/platform.ini %{mozappdir}/application.ini -%{mozappdir}/features/*.xpi %exclude %{mozappdir}/removed-files %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png %{_datadir}/icons/hicolor/22x22/apps/thunderbird.png