diff --git a/.gitignore b/.gitignore index e3bb629..f0790c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ /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 diff --git a/sources b/sources index 6b0b36d..0d81ca8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (wget2-2.2.1.tar.gz) = ce458c31eda12b12120dd39d43751d7ac3c9b46ea994ae383cc5a68be2ee776840126e5251a9479b8e3b350f093c6b3dc1dc8fca48a159e4117a73b328a91021 -SHA512 (wget2-2.2.1.tar.gz.sig) = ae79112fad4eaf7d12d8d6da86a735851b63433ed2c48300937f2e70ed52fe552a49e64e9c597580c91009cda7e2c5e129d6f9978e8312f8430438c723cbc16b +SHA512 (wget2-2.0.0.tar.gz) = 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb diff --git a/tim.ruehsen-keyring.asc b/tim.ruehsen-keyring.asc deleted file mode 100644 index 72be5fc..0000000 --- a/tim.ruehsen-keyring.asc +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=RW6p ------END PGP PUBLIC KEY BLOCK----- diff --git a/wget2.spec b/wget2.spec index a1f6380..5a5451e 100644 --- a/wget2.spec +++ b/wget2.spec @@ -1,26 +1,18 @@ -%if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} && 0%{?rhel} < 11) -%bcond as_wget 0 -%else -%bcond as_wget 1 -%endif - -%global somajor 4 +%global somajor 1 Name: wget2 -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: An advanced file and recursive website downloader # Documentation is GFDL -License: GPL-3.0-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later +License: LGPLv3+ and GFDL URL: https://gitlab.com/gnuwget/wget2 Source0: https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz -Source1: https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz.sig -# key 08302DB6A2670428 -Source2: tim.ruehsen-keyring.asc # Buildsystem build requirements BuildRequires: autoconf +BuildRequires: autogen BuildRequires: automake BuildRequires: libtool BuildRequires: flex-devel >= 2.5.35 @@ -30,10 +22,7 @@ BuildRequires: make # Documentation build requirements BuildRequires: doxygen -BuildRequires: git-core -%if ! 0%{?rhel} BuildRequires: pandoc -%endif # Wget2 build requirements BuildRequires: bzip2-devel @@ -57,16 +46,10 @@ BuildRequires: pkgconfig(libpsl) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) -%if ! 0%{?rhel} # Test suite BuildRequires: lcov BuildRequires: lzip -%endif -# For gpg signature verification -BuildRequires: gnupg2 - -Provides: webclient Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -97,35 +80,15 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Development libraries and headers needed for building applications to use functionality from GNU Wget2. -%if %{with as_wget} -%package wget -Summary: %{name} shim to provide wget -Requires: wget2%{?_isa} = %{version}-%{release} -# Replace wget1 -Conflicts: wget < 2 -Provides: wget = %{version}-%{release} -Provides: wget%{?_isa} = %{version}-%{release} -# From original wget package -Provides: webclient - -%description wget -This package provides the shim links for %{name} to be automatically -used in place of wget. This ensures that %{name} is used as -the system provider of wget. -%endif - %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -S git_am +%autosetup -p1 %build %configure --disable-static -%if ! 0%{?rhel} -# Remove RPATH, rely on default -Wl,--enable-new-dtags in Fedora. +# Remove RPATH sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%endif %make_build @@ -133,22 +96,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_install %find_lang %{name} -%if 0%{?rhel} -# tarball includes a pre-built manpage -install -D -m0644 -t %{buildroot}%{_mandir}/man1/ docs/man/man1/wget2.1 -%endif - # Purge all libtool archives find %{buildroot} -type f -name "*.la" -delete -print -# Delete useless noinstall binary -rm -v %{buildroot}%{_bindir}/%{name}_noinstall - -%if %{with as_wget} -ln -sr %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/wget -# Link wget(1) to wget2(1) -echo ".so man1/%{name}.1" > %{buildroot}%{_mandir}/man1/wget.1 -%endif %check %make_build check @@ -158,7 +108,8 @@ echo ".so man1/%{name}.1" > %{buildroot}%{_mandir}/man1/wget.1 %license COPYING* %doc README.md %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* +%{_bindir}/%{name}_noinstall +%{_mandir}/man1/* %files libs %license COPYING* @@ -169,103 +120,9 @@ echo ".so man1/%{name}.1" > %{buildroot}%{_mandir}/man1/wget.1 %{_includedir}/wgetver.h %{_libdir}/libwget*.so %{_libdir}/pkgconfig/libwget.pc -%{_mandir}/man3/libwget*.3* - -%if %{with as_wget} -%files wget -%{_bindir}/wget -%{_mandir}/man1/wget.1* -%endif - +%{_mandir}/man3/* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 2.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Jan 01 2026 LuK1337 - 2.2.1-1 -- New version 2.2.1 - -* Fri Jul 25 2025 Fedora Release Engineering - 2.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed May 14 2025 Michal Ruprich - 2.2.0-5 -- Removing Obsoletes so that wget2 can be replaced by wget1 - -* Fri Feb 28 2025 Neal Gompa - 2.2.0-3 -- Backport support for --show-progress flag - Resolves: rhbz#2348997 - -* Sun Jan 19 2025 Fedora Release Engineering - 2.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 02 2024 Michal Ruprich - 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 - 2.1.0-13 -- do not replace wget on el10 - -* Sat Jul 20 2024 Fedora Release Engineering - 2.1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 02 2024 Romain Geissler - 2.1.0-11 -- Disable TCP Fast Open by default - -* Mon May 20 2024 Romain Geissler - 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 - 2.1.0-9 -- Allow option --no-tcp-fastopen to work on Linux kernels >= 4.11. - -* Tue Apr 02 2024 Michal Ruprich - 2.1.0-8 -- Resolves: #2271362 - wget2 blacklists files intended for download - -* Sat Jan 27 2024 Fedora Release Engineering - 2.1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 14 2024 Neal Gompa - 2.1.0-6 -- Backport fix for wget to stdin - Resolves: rhbz#2257700 - -* Thu Jan 04 2024 Yaakov Selkowitz - 2.1.0-5 -- Drop unused autogen build dependency - -* Thu Dec 21 2023 Yaakov Selkowitz - 2.1.0-4 -- Avoid pandoc dependency on RHEL -- Fix tests on RHEL - -* Sat Dec 16 2023 Neal Gompa - 2.1.0-3 -- Enable wget2-wget for F40+ / RHEL10+ - -* Fri Sep 01 2023 Mikel Olasagasti Uranga - 2.1.0-2 -- Add gpg signature check - -* Fri Sep 01 2023 Neal Gompa - 2.1.0-1 -- New upstream version -- Add conditional for using wget2 as wget - -* Sat Jul 22 2023 Fedora Release Engineering - 2.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Mar 21 2023 Michal Ruprich - 2.0.0-5 -- SPDX migration - -* Sat Jan 21 2023 Fedora Release Engineering - 2.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Sun Sep 26 2021 Neal Gompa - 2.0.0-1 - Rebase to 2.0.0 final - Split out libraries into libs subpackage