From b97a304deb9aedcb6e3579c9adb52bae95852fe3 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 14 Dec 2023 17:30:47 +0100 Subject: [PATCH] Moved the clean section to the end of the install section %clean is no longer triggered during brew build which causes the rpmbuild byproducts appears in the build (nss, nspr, etc) Related: RHEL-19339 --- firefox.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/firefox.spec b/firefox.spec index e117ccf..c5e7b4b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1631,6 +1631,17 @@ rm -rf %{buildroot}%{mozappdir}/gtk2/ ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so %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 @@ -1644,16 +1655,6 @@ if [ $1 -eq 0 ]; then %{__rm} -rf %{mozappdir}/plugins 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 update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :