From 0fbba97dbee4fa8cdd47b44aa2bb75e5308ed1b4 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 18 Dec 2023 13:01:07 +0100 Subject: [PATCH] Move clean section to the end of the install section %clean is no longer triggered during brew build, which causes the rpmbuild byproducts to appear in the build (nss, nspr, etc) Related: RHEL-19352 --- thunderbird.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index b9e854c..8a885b1 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1419,9 +1419,7 @@ 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 sed -i -e 's|thunderbird|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml" -#=============================================================================== - -%clean +# Clean the created bundled rpms. rm -rf %{_srcrpmdir}/libffi*.src.rpm find %{_rpmdir} -name "libffi*.rpm" -delete rm -rf %{_srcrpmdir}/openssl*.src.rpm @@ -1431,6 +1429,8 @@ find %{_rpmdir} -name "nss*.rpm" -delete rm -rf %{_srcrpmdir}/nspr*.src.rpm find %{_rpmdir} -name "nspr*.rpm" -delete +#=============================================================================== + %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :