From 8630fbf767b4c5636732bc38bde698b85faac35c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 25 Aug 2017 12:06:36 +0300 Subject: [PATCH] scl-utils is not compatible with Lmod, fix the dependency (#1296383) scl-utils uses %{_bindir}/modulecmd which is not the alleged official interface, but since "module" command is implemented as a shell function/alias, calling it via exec() from C is a bit problematic. Maybe there are ways around but the current implementation depends on %{_bindir}/modulecmd being there, and thus it's not compatible with Lmod. This effectively reverts 969a3eb2f56679f81d60fcaad1b4a098dd6d417b but by depending on %{_bindir}/modulecmd instead of the pacakge name, makes the point clearer I hope. --- scl-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scl-utils.spec b/scl-utils.spec index 88307ad..3c55e33 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -1,7 +1,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: scl-utils -Epoch: 1 +Epoch: 2 Version: 2.0.2 Release: 1%{dist} Summary: Utilities for alternative packaging @@ -13,7 +13,7 @@ Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.b Source1: macros.scl-filesystem Buildrequires: cmake Buildrequires: rpm-devel -Requires: environment(modules) +Requires: %{_bindir}/modulecmd Patch1: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch @@ -80,6 +80,9 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Fri Aug 25 2017 Panu Matilainen - 1:2.0.2-2 +- scl-utils is not compatible with Lmod, fix the dependency (#1296383) + * Fri Aug 25 2017 Panu Matilainen - 1:2.0.2-1 - Rebase to 2.0.2