X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=wget2.spec;h=d72959dbc96c9e226a64d8c4b508284236e09888;hb=HEAD;hp=21e62d88f131c84abadd62d2b0cbcbe3f117a94f;hpb=1184f4a4199d425a458342eb58052307c3edca27;p=packages%2Fwget2.git

diff --git a/wget2.spec b/wget2.spec
index 21e62d8..d72959d 100644
--- a/wget2.spec
+++ b/wget2.spec
@@ -1,6 +1,8 @@
+#
 # Conditional build:
 %bcond_without	tests	# check target
 %bcond_with	gnutls	# use GnuTLS (wget default) instead of OpenSSL
+%bcond_with	pandoc	# build man with pandoc
 
 Summary:	A utility for retrieving files using the HTTP or FTP protocols
 Summary(es.UTF-8):	Cliente en línea de comando para bajar archivos WWW/FTP con recursión opcional
@@ -11,37 +13,35 @@ Summary(ru.UTF-8):	Утилита для получения файлов по п
 Summary(uk.UTF-8):	Утиліта для отримання файлів по протоколам HTTP та FTP
 Summary(zh_CN.UTF-8):	[通讯]功能强大的下载程序,支持断点续传
 Name:		wget2
-Version:	1.99.2
+Version:	2.1.0
 Release:	1
 License:	GPL v3+ with OpenSSL exception
 Group:		Networking/Utilities
 Source0:	https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.lz
-# Source0-md5:	a611727632b4d81cb894621ce01a435d
+# Source0-md5:	0ec2d5738a19967e90e26e3f28f83339
 URL:		http://www.gnu.org/software/wget/
 BuildRequires:	bzip2-devel
 BuildRequires:	doxygen
+BuildRequires:	gettext-tools >= 0.21
 # >= 3.6.3 for TLSv1.3
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 3.0.16}
 BuildRequires:	gpgme-devel
 BuildRequires:	libbrotli-devel
 BuildRequires:	libhsts-devel
-BuildRequires:	libidn2-devel
+BuildRequires:	libidn2-devel >= 0.14.0
 BuildRequires:	libmicrohttpd-devel
 BuildRequires:	libpsl-devel >= 0.16.0
+BuildRequires:	lzlib-devel
 BuildRequires:	nghttp2-devel
-# >= 1.1.0 for TLSv1.3
-%{!?with_gnutls:BuildRequires:	openssl-devel >= 1.0.1}
-BuildRequires:	pandoc
+%{!?with_gnutls:BuildRequires:	openssl-devel >= 1.1.0}
+%{?with_pandoc:BuildRequires:	pandoc}
 BuildRequires:	pcre2-8-devel
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
 BuildRequires:	zstd-devel
-%{?with_gnutls:Requires:	gnutls-libs >= 3.0.16}
-Requires:	libpsl >= 0.16.0
 Requires:	libwget2 = %{version}-%{release}
-%{!?with_gnutls:Requires:	openssl >= 1.0.1}
 Provides:	webclient
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -116,12 +116,20 @@ Proxy серверів, настроюваність.
 
 %package -n libwget2
 Summary:	Library that provides the basic functions needed by a web client
+Summary(pl.UTF-8):	Biblioteka udostępniająca podstawowe funkcje klienta WWW
 License:	LGPL v3+
 Group:		Libraries
+%{?with_gnutls:Requires:	gnutls-libs >= 3.0.16}
+Requires:	libidn2 >= 0.14.0
+Requires:	libpsl >= 0.16.0
+%{!?with_gnutls:Requires:	openssl >= 1.1.0}
 
 %description -n libwget2
 Library that provides the basic functions needed by a web client.
 
+%description -n libwget2 -l pl.UTF-8
+Biblioteka udostępniająca podstawowe funkcje klienta WWW.
+
 %package -n libwget2-devel
 Summary:	Header files for wget2 library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki wget2
@@ -154,21 +162,20 @@ Statyczna biblioteka wget2.
 %build
 %configure \
 	LDCONFIG=true \
-	--with-linux-crypto \
-	%{!?with_gnutls:--with-openssl=yes} \
-	--with-ssl%{!?with_gnutls:=openssl} \
-	--with-libpsl \
-	--with-libhsts \
-	--with-libnghttp2 \
+	--disable-silent-rules \
 	--with-bzip2 \
 	--with-gpgme \
-	--with-zlib \
-	--with-lzma \
+	--with-libhsts \
 	--with-libidn2 \
-	--with-libpcre2 \
 	--with-libmicrohttpd \
+	--with-libnghttp2 \
+	--with-libpcre2 \
+	--with-libpsl \
+	--with-linux-crypto \
+	--with-lzma \
 	--with-plugin-support \
-	--disable-silent-rules \
+	--with-ssl%{!?with_gnutls:=openssl} \
+	--with-zlib \
 	%{nil}
 %{__make}
 
@@ -181,16 +188,23 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_bindir}/wget2_noinstall
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/wget2_noinstall
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libwget.la
 
-%find_lang %{name}
+%if %{without pandoc}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p docs/man/man1/wget2.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%endif
 
-%post -n libwget2 -p /sbin/ldconfig
-%postun -n libwget2 -p /sbin/ldconfig
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-n libwget2 -p /sbin/ldconfig
+%postun	-n libwget2 -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README.md
@@ -199,17 +213,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libwget2
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwget.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwget.so.0
+%attr(755,root,root) %{_libdir}/libwget.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwget.so.2
 
 %files -n libwget2-devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwget.so
 %{_includedir}/wget.h
 %{_includedir}/wgetver.h
-%{_mandir}/man3/libwget*.3*
 %{_pkgconfigdir}/libwget.pc
-%{_libdir}/libwget.la
-%attr(755,root,root) %{_libdir}/libwget.so
+%{_mandir}/man3/libwget*.3*
 
 %files -n libwget2-static
 %defattr(644,root,root,755)