pool/rust
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 881724 from home:manfred-h:devel:languages:rust:rust-1.50

Browse Source 
- rust.spec: Fix typo.
  Add work-around for cargo not respecting _libexecdir on Leap.

OBS-URL: https://build.opensuse.org/request/show/881724
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=282
This commit is contained in:
William Brown 2021-03-29 02:28:58 +00:00 committed by Git OBS Bridge
parent 1a282984be
commit e6be971f1d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rust.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 28 07:56:31 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
- rust.spec: Fix typo.
Add work-around for cargo not respecting _libexecdir on Leap.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 11 16:21:34 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org> Thu Mar 11 16:21:34 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>

8
rust.spec
View File

@ -565,10 +565,16 @@ mkdir -p %{buildroot}%{_datadir}/cargo/registry
mkdir -p %{buildroot}%{_docdir}/cargo mkdir -p %{buildroot}%{_docdir}/cargo
ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html 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 install -D %{buildroot}%{_sysconfdir}/bash_completion.d/cargo %{buildroot}%{_datadir}/bash-completion/completions/cargo
# There should be nothing here at all # There should be nothing here at all
rm -rf %{buildroot}%{_sysconfdir} 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 # Remove llvm installation
rm -rf %{buildroot}/home rm -rf %{buildroot}/home