diff --git a/0001-runtime-install-wget2-wget-has-replaced-wget.patch b/0001-runtime-install-wget2-wget-has-replaced-wget.patch new file mode 100644 index 0000000..ff1bc4c --- /dev/null +++ b/0001-runtime-install-wget2-wget-has-replaced-wget.patch @@ -0,0 +1,31 @@ +From 0476a77915f678846f446f819c5fec66f2997386 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 26 Jan 2024 11:19:59 -0800 +Subject: [PATCH] runtime-install: wget2-wget has replaced wget + +wget has been retired: +https://src.fedoraproject.org/rpms/wget/c/ce69c17 +in favor of wget2-wget: +https://fedoraproject.org/wiki/Changes/Wget2asWget + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index d6029830..80213366 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -184,7 +184,7 @@ installpkg python3-pyatspi + ## extra tools not required by anaconda + installpkg nano nano-default-editor + installpkg vim-minimal strace lsof dump xz less +-installpkg wget rsync bind-utils ftp mtr vconfig ++installpkg wget2-wget rsync bind-utils ftp mtr vconfig + installpkg spice-vdagent + installpkg gdisk hexedit sg3_utils + +-- +2.43.0 + diff --git a/lorax.spec b/lorax.spec index 7e7e8c2..762c1db 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 40.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -15,6 +15,10 @@ URL: https://github.com/weldr/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1370 +# wget replaced by wget2-wget +Patch: 0001-runtime-install-wget2-wget-has-replaced-wget.patch + BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: make @@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Fri Jan 26 2024 Adam Williamson - 40.3-4 +- Backport PR #1370 to handle wget being replaced by wget2-wget + * Thu Jan 25 2024 Fedora Release Engineering - 40.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild