Skip to content

Commit f316210

Browse files
committed
rpm: update-alternatives is now available from _bindir
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 3e6ad82 commit f316210

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

share/rpm/environment-modules.spec.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Requires: procps-ng
5858
Requires: man-db
5959
%endif
6060
Requires(post): coreutils
61-
Requires(post): %{_sbindir}/update-alternatives
62-
Requires(postun): %{_sbindir}/update-alternatives
61+
Requires(post): %{_bindir}/update-alternatives
62+
Requires(postun): %{_bindir}/update-alternatives
6363
Provides: environment(modules)
6464
Obsoletes: modules-tcl <= 1.923
6565
Obsoletes: environment-modules-compat <= 4.8.99
@@ -192,18 +192,18 @@ make test QUICKTEST=1
192192

193193
# Migration from version 3.x to 4
194194
if [ "$(readlink /etc/alternatives/modules.sh)" = '%{_datadir}/Modules/init/modules.sh' ]; then
195-
%{_sbindir}/update-alternatives --remove modules.sh %{_datadir}/Modules/init/modules.sh
195+
update-alternatives --remove modules.sh %{_datadir}/Modules/init/modules.sh
196196
fi
197197

198-
%{_sbindir}/update-alternatives \
198+
update-alternatives \
199199
--install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \
200200
--slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \
201201
--slave %{_datadir}/fish/vendor_conf.d/modules.fish modules.fish %{_datadir}/Modules/init/fish \
202202
--slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl
203203

204204
%postun
205205
if [ $1 -eq 0 ] ; then
206-
%{_sbindir}/update-alternatives --remove modules.sh %{_datadir}/Modules/init/profile.sh
206+
update-alternatives --remove modules.sh %{_datadir}/Modules/init/profile.sh
207207
fi
208208
%endif
209209

0 commit comments

Comments
 (0)