From 0b003bc95364084a9eb7fe5b4d469fd2c544f952 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Feb 20 2025 13:39:40 +0000 Subject: Alternatives: avoid explicit paths to update-alternatives Using installation path macros in file dependencies is disallowed by commit 35d89f0f3ff118359f1fef1c328570a944e0ddf8 ("Recommend avoiding macros in file depenencies") and breaks flatpak builds when the dependency is in the runtime. Furthermore, with the bin-sbin merge, using %_bindir is only compatible with F42+. --- diff --git a/guidelines/modules/ROOT/pages/Alternatives.adoc b/guidelines/modules/ROOT/pages/Alternatives.adoc index f1ec3d5..24117cb 100644 --- a/guidelines/modules/ROOT/pages/Alternatives.adoc +++ b/guidelines/modules/ROOT/pages/Alternatives.adoc @@ -85,8 +85,8 @@ Example from antlr.spec: [source, rpm-spec] ---- -Requires(post): %{_bindir}/update-alternatives -Requires(postun): %{_bindir}/update-alternatives +Requires(post): alternatives +Requires(postun): alternatives ... %install ... @@ -112,9 +112,9 @@ slightly edited: [source, rpm-spec] ---- -Requires(post): %{_bindir}/update-alternatives -Requires(postun): %{_bindir}/update-alternatives -Requires(preun): %{_bindir}/update-alternatives +Requires(post): alternatives +Requires(postun): alternatives +Requires(preun): alternatives ... %install ... @@ -137,7 +137,7 @@ touch %{buildroot}%{_mandir}/man8/sendmail.8 %postun if [ "$1" -ge "1" ]; then if [ "`+readlink %{_sysconfdir}/alternatives/mta+`" == "%{_bindir}/sendmail.sendmail" ]; then - %{_bindir}/alternatives --set mta %{_bindir}/sendmail.sendmail + update-alternatives --set mta %{_bindir}/sendmail.sendmail fi fi