rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Moved the clean section to the end of the install section

Browse Source 
%clean is no longer triggered during brew build which causes the
rpmbuild byproducts appears in the build (nss, nspr, etc)

Related: RHEL-19339
This commit is contained in:
Jan Horak 2023-12-14 17:30:47 +01:00 committed by Eike Rathke
parent c04f377e98
commit b97a304deb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firefox.spec
View File

@ -1631,6 +1631,17 @@ rm -rf %{buildroot}%{mozappdir}/gtk2/
ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so
ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so
%endif %endif
# clean the created bundled rpms if there are any
rm -rf %{_srcrpmdir}/libffi*.src.rpm
find %{_rpmdir} -name "libffi*.rpm" -delete
rm -rf %{_srcrpmdir}/openssl*.src.rpm
find %{_rpmdir} -name "openssl*.rpm" -delete
rm -rf %{_srcrpmdir}/nss*.src.rpm
find %{_rpmdir} -name "nss*.rpm" -delete
rm -rf %{_srcrpmdir}/nspr*.src.rpm
find %{_rpmdir} -name "nspr*.rpm" -delete
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%check %check
@ -1644,16 +1655,6 @@ if [ $1 -eq 0 ]; then
%{__rm} -rf %{mozappdir}/plugins %{__rm} -rf %{mozappdir}/plugins
fi fi
%clean
rm -rf %{_srcrpmdir}/libffi*.src.rpm
find %{_rpmdir} -name "libffi*.rpm" -delete
rm -rf %{_srcrpmdir}/openssl*.src.rpm
find %{_rpmdir} -name "openssl*.rpm" -delete
rm -rf %{_srcrpmdir}/nss*.src.rpm
find %{_rpmdir} -name "nss*.rpm" -delete
rm -rf %{_srcrpmdir}/nspr*.src.rpm
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 || :