Use curl instead of wget, since wget2 is broken

(https://gitlab.com/gnuwget/wget2/-/issues/652)
This commit is contained in:
Richard W.M. Jones 2024-01-15 09:38:37 +00:00
parent 3a2a7734bd
commit 181f457c59

View File

@ -50,7 +50,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.52.0 Version: 1.52.0
Release: 3%{?dist} Release: 4%{?dist}
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
# Build only for architectures that have a kernel # Build only for architectures that have a kernel
@ -140,7 +140,7 @@ BuildRequires: jansson-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: bash-completion BuildRequires: bash-completion
BuildRequires: /usr/bin/ping BuildRequires: /usr/bin/ping
BuildRequires: /usr/bin/wget BuildRequires: curl
BuildRequires: xz BuildRequires: xz
BuildRequires: zstd BuildRequires: zstd
BuildRequires: libzstd-devel BuildRequires: libzstd-devel
@ -720,7 +720,7 @@ sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README
# Test if network is available. # Test if network is available.
ip addr list ||: ip addr list ||:
ip route list ||: ip route list ||:
if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then if ping -c 3 -w 20 8.8.8.8 && curl http://libguestfs.org -o /dev/null; then
extra= extra=
else else
mkdir cachedir repo mkdir cachedir repo
@ -1100,6 +1100,10 @@ rm ocaml/html/.gitignore
%changelog %changelog
* Mon Jan 15 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-4
- Use curl instead of wget, since wget2 is broken
(https://gitlab.com/gnuwget/wget2/-/issues/652)
* Tue Jan 9 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-3 * Tue Jan 9 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-3
- Make cache directory find more robust - Make cache directory find more robust
/var/cache/libdnf5 may be missing if dnf5 is not around /var/cache/libdnf5 may be missing if dnf5 is not around