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-19343
This commit is contained in:
parent
8ff89c91b4
commit
b96fa5a3ae
@ -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
|
%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $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"
|
sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
|
||||||
|
|
||||||
#===============================================================================
|
# Clean the created bundled rpms.
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{_srcrpmdir}/libffi*.src.rpm
|
rm -rf %{_srcrpmdir}/libffi*.src.rpm
|
||||||
find %{_rpmdir} -name "libffi*.rpm" -delete
|
find %{_rpmdir} -name "libffi*.rpm" -delete
|
||||||
rm -rf %{_srcrpmdir}/openssl*.src.rpm
|
rm -rf %{_srcrpmdir}/openssl*.src.rpm
|
||||||
@ -1431,6 +1429,8 @@ find %{_rpmdir} -name "nss*.rpm" -delete
|
|||||||
rm -rf %{_srcrpmdir}/nspr*.src.rpm
|
rm -rf %{_srcrpmdir}/nspr*.src.rpm
|
||||||
find %{_rpmdir} -name "nspr*.rpm" -delete
|
find %{_rpmdir} -name "nspr*.rpm" -delete
|
||||||
|
|
||||||
|
#===============================================================================
|
||||||
|
|
||||||
%post
|
%post
|
||||||
update-desktop-database &> /dev/null || :
|
update-desktop-database &> /dev/null || :
|
||||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
|
Loading…
Reference in New Issue
Block a user