X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wget.spec;h=a569c47ddffd8dedbee6e251892e7df2736c1d05;hb=7d3e1c4a6fa244019c4c0986d5511e1b1638ff1c;hp=d9921dc89578c8b901b9704fcd464bae0ae67f84;hpb=a14f6b2ceb0582ac7de4996948fba6ab70b40524;p=packages%2Fwget.git

diff --git a/wget.spec b/wget.spec
index d9921dc..a569c47 100644
--- a/wget.spec
+++ b/wget.spec
@@ -5,7 +5,8 @@
 # - add http://article.gmane.org/gmane.comp.web.wget.patches/2333
 #
 # Conditional build:
-%bcond_without	tests
+%bcond_without	tests	# check target
+%bcond_without	metalink # build without metalink support
 %bcond_with	gnutls	# use GnuTLS (wget default) instead of OpenSSL
 
 Summary:	A utility for retrieving files using the HTTP or FTP protocols
@@ -17,12 +18,12 @@ Summary(ru.UTF-8):	Утилита для получения файлов по п
 Summary(uk.UTF-8):	Утиліта для отримання файлів по протоколам HTTP та FTP
 Summary(zh_CN.UTF-8):	[通讯]功能强大的下载程序,支持断点续传
 Name:		wget
-Version:	1.17.1
-Release:	3
+Version:	1.20.3
+Release:	1
 License:	GPL v3+ with OpenSSL exception
 Group:		Networking/Utilities
-Source0:	http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.xz
-# Source0-md5:	b0d58ef4963690e71effba24c105ed52
+Source0:	http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.lz
+# Source0-md5:	3bc242eb69165247b1793dd0b794ff52
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	d8b2b56ec7461606c22edbafaf8a418f
 Patch0:		%{name}-info.patch
@@ -31,18 +32,19 @@ Patch2:		%{name}-home_etc.patch
 Patch3:		%{name}-ssl-certs.patch
 Patch4:		user.xdg.origin.url.patch
 URL:		http://www.gnu.org/software/wget/
-BuildRequires:	attr-devel
-BuildRequires:	autoconf >= 2.61
+BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	gettext-devel >= 0.17
-%{?with_gnutls:BuildRequires:	gnutls-devel}
-BuildRequires:	gpgme-devel >= 0.4.2
-BuildRequires:	libidn-devel
-BuildRequires:	libmetalink-devel
-BuildRequires:	libpsl-devel
+BuildRequires:	gettext-tools >= 0.19.8
+# >= 3.6.3 for TLSv1.3
+%{?with_gnutls:BuildRequires:	gnutls-devel >= 3.0.16}
+%{?with_metalink:BuildRequires:	gpgme-devel >= 0.4.2}
+BuildRequires:	libidn2-devel
+%{?with_metalink:BuildRequires:	libmetalink-devel}
+BuildRequires:	libpsl-devel >= 0.16.0
 BuildRequires:	libuuid-devel
-%{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7m}
-BuildRequires:	pcre-devel
+# >= 1.1.0 for TLSv1.3
+%{!?with_gnutls:BuildRequires:	openssl-devel >= 1.0.1}
+BuildRequires:	pcre2-8-devel
 BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
@@ -56,6 +58,9 @@ BuildRequires:	perl-IO-Socket-SSL
 BuildRequires:	python3-modules >= 1:3.0
 %endif
 Provides:	webclient
+%{?with_gnutls:Requires:	gnutls-libs >= 3.0.16}
+%{!?with_gnutls:Requires:	openssl >= 1.0.1}
+Requires:	libpsl >= 0.16.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqfiles		%{_bindir}/rmold
@@ -154,7 +159,6 @@ chmod +x build-aux/bzr-version-gen
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-debug \
 	--enable-digest \
 	--enable-ipv6 \
 	--enable-iri \
@@ -163,8 +167,9 @@ chmod +x build-aux/bzr-version-gen
 	--enable-ntlm \
 	--enable-opie \
 	--enable-pcre \
+	--disable-silent-rules \
 	--with-libpsl \
-	--with-metalink \
+	%{__with_without metalink} \
 	--with-ssl%{!?with_gnutls:=openssl} \
 	--with-zlib \
 	%{nil}