Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This fixes a bug that I hit frequently:
https://gitlab.com/gnuwget/wget2/-/issues/689

Signed-off-by: Ondrej Mosnáček <omosnacek@gmail.com>

.gitignore

@@ -1,3 +1,7 @@
 /wget2-2.0.0.tar.gz
 /wget2-2.1.0.tar.gz
 /wget2-2.1.0.tar.gz.sig
+/wget2-2.2.0.tar.gz
+/wget2-2.2.0.tar.gz.sig
+/wget2-2.2.1.tar.gz
+/wget2-2.2.1.tar.gz.sig

0001-src-log.c-log_init-Redirect-INFO-logs-to-stderr-with.patch

@@ -1,25 +0,0 @@
-From 7da90c7ea755fffbfbe9006d29524c7c8a86a925 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Sun, 14 Jan 2024 16:43:15 +0100
-Subject: [PATCH] * src/log.c (log_init): Redirect INFO logs to stderr with -O-
-
----
- src/log.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/log.c b/src/log.c
-index 8b6796e9..61adde4b 100644
---- a/src/log.c
-+++ b/src/log.c
-@@ -226,7 +226,7 @@ void log_init(void)
- 
- 	// set info logging
- 	wget_logger_set_func(wget_get_logger(WGET_LOGGER_INFO),
--		config.verbose && !config.quiet ? (fileno(stdout) == fileno(stderr) ? write_info_stderr : write_info_stdout) : NULL);
-+		config.verbose && !config.quiet ? ((fileno(stdout) == fileno(stderr) || !wget_strcmp(config.output_document, "-")) ? write_info_stderr : write_info_stdout) : NULL);
- //	wget_logger_set_stream(wget_get_logger(WGET_LOGGER_INFO), config.verbose && !config.quiet ? stdout : NULL);
- #endif
- }
--- 
-2.43.0
-

sources

@@ -1,2 +1,2 @@
-SHA512 (wget2-2.1.0.tar.gz) = ae1fc267b1c2ee182ee59f0fc34fef238326a20f1ea1c15be6db2c16b70d49e89f61ca937d3e64d214f73ef9646ba4318782ac4210db51bd3d89c55ce4406872
-SHA512 (wget2-2.1.0.tar.gz.sig) = 22139c2a5314ab5689ac18d4daa4d39efb18bbd444bcba22eec79ccfe4401d0e01f41f293cc7f0a09ff66d25b365574a823302b0c41deb97ddc3d98e0d1500cf
+SHA512 (wget2-2.2.1.tar.gz) = ce458c31eda12b12120dd39d43751d7ac3c9b46ea994ae383cc5a68be2ee776840126e5251a9479b8e3b350f093c6b3dc1dc8fca48a159e4117a73b328a91021
+SHA512 (wget2-2.2.1.tar.gz.sig) = ae79112fad4eaf7d12d8d6da86a735851b63433ed2c48300937f2e70ed52fe552a49e64e9c597580c91009cda7e2c5e129d6f9978e8312f8430438c723cbc16b

wget2.spec

@@ -1,14 +1,14 @@
-%if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} && 0%{?rhel} < 10)
+%if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} && 0%{?rhel} < 11)
 %bcond as_wget 0
 %else
 %bcond as_wget 1
 %endif
 
-%global somajor 2
+%global somajor 4
 
 Name:           wget2
-Version:        2.1.0
-Release:        7%{?dist}
+Version:        2.2.1
+Release:        3%{?dist}
 Summary:        An advanced file and recursive website downloader
 
 # Documentation is GFDL
@@ -19,10 +19,6 @@ Source1:        https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz.sig
 # key 08302DB6A2670428
 Source2:        tim.ruehsen-keyring.asc
 
-# Backports from upstream
-## Fix behavior for downloading to stdin (rhbz#2257700, gl#gnuwget/wget2#651)
-Patch0001:      0001-src-log.c-log_init-Redirect-INFO-logs-to-stderr-with.patch
-
 # Buildsystem build requirements
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -105,9 +101,8 @@ use functionality from GNU Wget2.
 %package wget
 Summary:        %{name} shim to provide wget
 Requires:       wget2%{?_isa} = %{version}-%{release}
-# Replace wget
+# Replace wget1
 Conflicts:      wget < 2
-Obsoletes:      wget < 2
 Provides:       wget = %{version}-%{release}
 Provides:       wget%{?_isa} = %{version}-%{release}
 # From original wget package
@@ -121,7 +116,7 @@ the system provider of wget.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
+%autosetup -S git_am
 
 
 %build
@@ -184,6 +179,54 @@ echo ".so man1/%{name}.1" > %{buildroot}%{_mandir}/man1/wget.1
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Thu Jan 01 2026 LuK1337 <priv.luk@gmail.com> - 2.2.1-1
+- New version 2.2.1
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Wed May 14 2025 Michal Ruprich <mruprich@redhat.com> - 2.2.0-5
+- Removing Obsoletes so that wget2 can be replaced by wget1
+
+* Fri Feb 28 2025 Neal Gompa <ngompa@fedoraproject.org> - 2.2.0-3
+- Backport support for --show-progress flag
+  Resolves: rhbz#2348997
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Dec 02 2024 Michal Ruprich <mruprich@redhat.com> - 2.2.0-1
+- New version 2.2.0
+- Resolves: rhbz#2298879 - Using options -nc and -O simultaneously causes existing files to be clobbered/truncated
+- Resolves: rhbz#2327788 - wget starts using non-working IPv6 addresses on dual stack
+- Resolves: rhbz#2327728 - Crash: "free(): double free detected in tcache 2" when using --load-cookies
+- Resolves: rhbz#2280151 - wget2 always re-downdloads when using custom output filename
+
+* Fri Aug 09 2024 Jonathan Wright <jonathan@almalinux.org> - 2.1.0-13
+- do not replace wget on el10
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jul 02 2024 Romain Geissler <romain.geissler@amadeus.com> - 2.1.0-11
+- Disable TCP Fast Open by default
+
+* Mon May 20 2024 Romain Geissler <romain.geissler@amadeus.com> - 2.1.0-10
+- Disable explicit OCSP requests by default for privacy reasons.
+- Accept --progress=dot:... for backwards compatibility.
+
+* Sat May 11 2024 Romain Geissler <romain.geissler@amadeus.com> - 2.1.0-9
+- Allow option --no-tcp-fastopen to work on Linux kernels >= 4.11.
+
+* Tue Apr 02 2024 Michal Ruprich <mruprich@redhat.com> - 2.1.0-8
+- Resolves: #2271362 - wget2 blacklists files intended for download
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild