diff --git a/rust.changes b/rust.changes index 0125558..2eee0f7 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 28 07:56:31 UTC 2021 - Manfred Hollstein + +- rust.spec: Fix typo. + Add work-around for cargo not respecting _libexecdir on Leap. + ------------------------------------------------------------------- Thu Mar 11 16:21:34 UTC 2021 - Guillaume GARDET diff --git a/rust.spec b/rust.spec index b4f5565..c421c63 100644 --- a/rust.spec +++ b/rust.spec @@ -565,10 +565,16 @@ mkdir -p %{buildroot}%{_datadir}/cargo/registry mkdir -p %{buildroot}%{_docdir}/cargo ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html -# Move the bash-completition to correct directory for openSUSE +# Move the bash-completion to correct directory for openSUSE install -D %{buildroot}%{_sysconfdir}/bash_completion.d/cargo %{buildroot}%{_datadir}/bash-completion/completions/cargo # There should be nothing here at all rm -rf %{buildroot}%{_sysconfdir} +# cargo does not respect our _libexec setting on Leap: +if [ ! -f %{buildroot}%{_libexecdir}/cargo-credential-1password ] && + [ -f %{buildroot}%{_exec_prefix}/libexec/cargo-credential-1password ]; then + mv %{buildroot}%{_exec_prefix}/libexec/cargo-credential-1password \ + %{buildroot}%{_libexecdir}/cargo-credential-1password +fi # Remove llvm installation rm -rf %{buildroot}/home