Replace wget with wget2

https://fedoraproject.org/wiki/Changes/Wget2asWget https://github.com/minimization/content-resolver-input/pull/1046
2024-01-13 22:05:37 -05:00 · 2024-01-13 22:05:37 -05:00 · b78f09a8fd
commit b78f09a8fd
parent 7ed887cfb9
6 changed files with 10 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -40,3 +40,4 @@ clog
 /lorax-templates-rhel-10.0-38.tar.gz
 /lorax-templates-rhel-10.0-39.tar.gz
 /lorax-templates-rhel-10.0-40.tar.gz
+/lorax-templates-rhel-10.0-41.tar.gz
--- a/80-rhel/runtime-cleanup.tmpl
+++ b/80-rhel/runtime-cleanup.tmpl
@ -319,7 +319,7 @@ removefrom util-linux-core --allbut \
    /etc/mtab \
    /usr/sbin/{agetty,blkid,blockdev,fsck,losetup,mkswap,partx,swapoff,swapon}
 removefrom volume_key-libs /usr/share/locale/*
-removefrom wget /etc/* /usr/share/locale/*
+removefrom wget2 /usr/share/locale/*
 removefrom wpa_supplicant /usr/sbin/eapol_test
 removefrom xorg-x11-drv-intel /usr/${libdir}/libI*
 removefrom xorg-x11-drv-wacom /usr/bin/*
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@ -178,7 +178,7 @@ installpkg python3-pyatspi
 ## extra tools not required by anaconda
 installpkg nano
 installpkg vim-minimal strace lsof xz less
-installpkg wget rsync bind-utils ftp mtr
+installpkg wget2-wget rsync bind-utils ftp mtr
 installpkg spice-vdagent
 installpkg gdisk hexedit sg3_utils
 installpkg perl-interpreter
--- a/2
+++ b/2
@ -1 +1 @@
-40
+41
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        10.0
-Release:        40%{?dist}
+Release:        41%{?dist}
 Summary:        RHEL build templates for lorax and livemedia-creator

 License:        GPLv2+
@ -10,7 +10,7 @@ BuildArch:      noarch
 # This tarball is generated from the contents of this dist-git repository
 # by running the command `make tar`.
 # See README for full details of how to update this package
-Source0:        lorax-templates-rhel-10.0-40.tar.gz
+Source0:        lorax-templates-rhel-10.0-41.tar.gz

 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@ -40,6 +40,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*

 %changelog
+* Sun Jan 14 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 10.0-41
+- Replace wget with wget2
+
 * Wed Dec 13 2023 Stephen Gallagher <sgallagh@redhat.com> - 10.0-40
 -  ()

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (lorax-templates-rhel-10.0-40.tar.gz) = e66322214b067e6c0fce10b3cbb9a9a1f21c6483ef44ec8118cc5a10136624d507d5ad676867fec357f06ef0d9a71dd59630e857f55c534839b89c717911ac92
+SHA512 (lorax-templates-rhel-10.0-41.tar.gz) = 1531305e645c3da0408badb1d236d6facda469b7cb82152ea7d672686dcaca4b4602dfc0cf147038303043c806704d02859bddc757414ebc1b6c50906800205f