diff --git a/wget2.spec b/wget2.spec index 391318a..f738d3f 100644 --- a/wget2.spec +++ b/wget2.spec @@ -1,14 +1,8 @@ -%if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} && 0%{?rhel} < 10) -%bcond as_wget 0 -%else -%bcond as_wget 1 -%endif - %global somajor 2 Name: wget2 Version: 2.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced file and recursive website downloader # Documentation is GFDL @@ -38,6 +32,9 @@ BuildRequires: git-core %if ! 0%{?rhel} BuildRequires: pandoc %endif +%if 0%{?rhel} == 8 +BuildRequires: libassuan-devel +%endif # Wget2 build requirements BuildRequires: bzip2-devel @@ -101,24 +98,6 @@ 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 wget -Conflicts: wget < 2 -Obsoletes: 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 -p1 @@ -149,12 +128,6 @@ 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 @@ -176,14 +149,11 @@ echo ".so man1/%{name}.1" > %{buildroot}%{_mandir}/man1/wget.1 %{_libdir}/pkgconfig/libwget.pc %{_mandir}/man3/libwget*.3* -%if %{with as_wget} -%files wget -%{_bindir}/wget -%{_mandir}/man1/wget.1* -%endif - %changelog +* Mon Feb 12 2024 Jonathan Wright - 2.1.0-8 +- Update spec for EL8 builds + * Sat Jan 27 2024 Fedora Release Engineering - 2.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild