mkmultiarch script is buggy when target file already exists

"Cannot execute /usr/bin/multiarch-x86_64-linux/multiarch-x86_64-linux/curl-config"
This commit is contained in:
Mikhail Novosyolov 2020-01-02 21:39:19 +03:00
parent 6d82d41c13
commit dffdfb0323

View file

@ -25,7 +25,7 @@
Summary: Gets a file from a FTP, GOPHER or HTTP server
Name: curl
Version: 7.67.0
Release: 6
Release: 7
Epoch: 1
License: BSD-like
Group: Networking/Other
@ -273,6 +273,8 @@ rm -r docs/examples/.deps ||:
case "$SSL" in
openssl )
%makeinstall_std
# TODO: maybe make curl-libressl-config?
%multiarch_binaries %{buildroot}%{_bindir}/%{name}-config
;;
libressl )
tmp="$(mktemp -d -p $(pwd))"
@ -298,9 +300,6 @@ esac
sed -i -e 's!-Wl,--as-needed!!' -e 's!-Wl,--no-undefined!!' %{buildroot}%{_bindir}/%{name}-config
sed -i -e 's!-Wl,--as-needed!!' -e 's!-Wl,--no-undefined!!' %{buildroot}%{_libdir}/pkgconfig/*.pc
# TODO: maybe make curl-libressl-config?
%multiarch_binaries %{buildroot}%{_bindir}/%{name}-config
# (tpg) use rootcerts's certificates #35917
find %{buildroot} -name ca-bundle.crt -exec rm -f '{}' \;