From f4d1c9b52095cc4454cb3cfc2e51662dab09e33e Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Fri, 7 Aug 2020 06:46:13 +0200 Subject: [PATCH] rpm: fix modulecmd pre-alternatives check Was wrongly checking %{buildroot} content rather targeted system. --- contrib/rpm/environment-modules.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/rpm/environment-modules.spec.in b/contrib/rpm/environment-modules.spec.in index d75dd67e..08233f95 100644 --- a/contrib/rpm/environment-modules.spec.in +++ b/contrib/rpm/environment-modules.spec.in @@ -167,7 +167,7 @@ make test # Cleanup from pre-alternatives [ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh [ ! -L %{_sysconfdir}/profile.d/modules.csh ] && rm -f %{_sysconfdir}/profile.d/modules.csh -[ ! -L %{buildroot}%{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd +[ ! -L %{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd # Migration from version 3.x to 4 if [ "$(readlink /etc/alternatives/modules.sh)" = '%{_datadir}/Modules/init/modules.sh' ]; then