diff --git a/_lastrevision b/_lastrevision index dea4ec1..dab765c 100644 --- a/_lastrevision +++ b/_lastrevision @@ -1 +1 @@ -28e6e64e03c46f34ac800b2bc2fc78ec0176e0e4 \ No newline at end of file +4e81748d5e88d323e700a458ca0e9680acc81927 \ No newline at end of file diff --git a/salt.changes b/salt.changes index 0fff72c..0f8e8d5 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 24 16:17:55 UTC 2025 - Pablo Suárez Hernández + +- Fix issue of using update-alternatives with alts + ------------------------------------------------------------------- Fri Feb 21 12:46:01 UTC 2025 - Pablo Suárez Hernández diff --git a/salt.spec b/salt.spec index a6a6fdb..eff1422 100644 --- a/salt.spec +++ b/salt.spec @@ -1519,27 +1519,33 @@ for SALT_SCRIPT in salt salt-api salt-cloud salt-cp salt-key salt-master salt-mi fi done +%if ! %{with libalternatives} %post -n python-salt -for SALT_SCRIPT in salt-call salt-support spm; do - update-alternatives --quiet --install "%{_bindir}/${SALT_SCRIPT}" "${SALT_SCRIPT}" \ - "%{_bindir}/${SALT_SCRIPT}-%{python_bin_suffix}" %{python_version_nodots} -done -for SALT_SCRIPT in salt salt-api salt-cloud salt-cp salt-key salt-master salt-minion salt-proxy salt-run salt-ssh salt-syndic zyppnotify; do - update-alternatives --quiet --install "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}" "${SALT_SCRIPT}" \ - "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}-%{python_bin_suffix}" %{python_version_nodots} -done +if [ -f /usr/sbin/update-alternatives ]; then + for SALT_SCRIPT in salt-call salt-support spm; do + update-alternatives --quiet --install "%{_bindir}/${SALT_SCRIPT}" "${SALT_SCRIPT}" \ + "%{_bindir}/${SALT_SCRIPT}-%{python_bin_suffix}" %{python_version_nodots} + done + for SALT_SCRIPT in salt salt-api salt-cloud salt-cp salt-key salt-master salt-minion salt-proxy salt-run salt-ssh salt-syndic zyppnotify; do + update-alternatives --quiet --install "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}" "${SALT_SCRIPT}" \ + "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}-%{python_bin_suffix}" %{python_version_nodots} + done +fi %postun -n python-salt -for SALT_SCRIPT in salt-call salt-support spm; do - if [ ! -e "%{_bindir}/${SALT_SCRIPT}-%{python_bin_suffix}" ]; then - update-alternatives --quiet --remove "${SALT_SCRIPT}" "%{_bindir}/${SALT_SCRIPT}-%{python_bin_suffix}" - fi -done -for SALT_SCRIPT in salt salt-api salt-cloud salt-cp salt-key salt-master salt-minion salt-proxy salt-run salt-ssh salt-syndic zyppnotify; do - if [ ! -e "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}-%{python_bin_suffix}" ]; then - update-alternatives --quiet --remove "${SALT_SCRIPT}" "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}-%{python_bin_suffix}" - fi -done +if [ -f /usr/sbin/update-alternatives ]; then + for SALT_SCRIPT in salt-call salt-support spm; do + if [ ! -e "%{_bindir}/${SALT_SCRIPT}-%{python_bin_suffix}" ]; then + update-alternatives --quiet --remove "${SALT_SCRIPT}" "%{_bindir}/${SALT_SCRIPT}-%{python_bin_suffix}" + fi + done + for SALT_SCRIPT in salt salt-api salt-cloud salt-cp salt-key salt-master salt-minion salt-proxy salt-run salt-ssh salt-syndic zyppnotify; do + if [ ! -e "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}-%{python_bin_suffix}" ]; then + update-alternatives --quiet --remove "${SALT_SCRIPT}" "%{_exec_prefix}/libexec/salt/${SALT_SCRIPT}-%{python_bin_suffix}" + fi + done +fi +%endif %endif %if 0%{?singlespec_compat}