X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=curl.spec;h=0b7540641c17b1fbf73186da98623594bcc7dc60;hb=c6b65fdb2cabb66f78ed214400f0d4b966ed3262;hp=ed1828cddf4b47f09a56cdb8c427693a908712ba;hpb=0eee87e52ddd3af001433563da50f72bd737c61d;p=packages%2Fcurl.git

diff --git a/curl.spec b/curl.spec
index ed1828c..0b75406 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,3 +1,4 @@
+# TODO: ngtpc2/nghttp3 when ready (packages released, support working in curl)
 #
 # Conditional build:
 %bcond_without	ssh		# SSH support
@@ -22,12 +23,12 @@ Summary(pt_BR.UTF-8):	Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e
 Summary(ru.UTF-8):	Утилита для получения файлов с серверов FTP, HTTP и других
 Summary(uk.UTF-8):	Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:		curl
-Version:	7.60.0
-Release:	2
+Version:	7.73.0
+Release:	1
 License:	MIT-like
 Group:		Applications/Networking
 Source0:	https://curl.haxx.se/download/%{name}-%{version}.tar.xz
-# Source0-md5:	a889cd11b4ae8794b7030472cb4df0a0
+# Source0-md5:	d7df02d3b78b625fee4dd765808a6eb6
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-krb5flags.patch
 URL:		http://curl.haxx.se/
@@ -43,20 +44,21 @@ BuildRequires:	libpsl-devel
 %{?with_ssh:BuildRequires:	libssh2-devel >= 1.2.8}
 BuildRequires:	libtool
 BuildRequires:	nettle-devel
-%{?with_http2:BuildRequires:	nghttp2-devel >= 1.9.0}
+%{?with_http2:BuildRequires:	nghttp2-devel >= 1.12.0}
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.527
 %if %{with ssl}
 %if %{with gnutls}
-BuildRequires:	gnutls-devel
+BuildRequires:	gnutls-devel >= 3.1.10
 %else
 BuildRequires:	openssl-devel >= 1.0.1
 %endif
 %endif
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	libcurl2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -115,9 +117,11 @@ Summary:	curl library
 Summary(pl.UTF-8):	Biblioteka curl
 Group:		Libraries
 %{?with_ares:Requires:	c-ares >= 1.7.0}
+%{?with_gnutls:Requires:	gnutls-libs >= 3.1.10}
 %{?with_ssh:Requires:	libssh2 >= 1.2.8}
-%{?with_http2:Requires:	nghttp2-libs >= 1.9.0}
+%{?with_http2:Requires:	nghttp2-libs >= 1.12.0}
 %if %{with ssl} && %{without gnutls}
+Requires:	libbrotli >= 1.0.0
 Requires:	openssl >= 1.0.1
 %endif
 Suggests:	ca-certificates
@@ -144,16 +148,17 @@ Requires:	libidn2-devel
 Requires:	libpsl-devel
 %{?with_rtmp:Requires:	librtmp-devel}
 %{?with_ssh:Requires:	libssh2-devel >= 1.2.8}
-%{?with_http2:Requires:	nghttp2-devel >= 1.9.0}
+%{?with_http2:Requires:	nghttp2-devel >= 1.12.0}
 %{?with_ldap:Requires:	openldap-devel}
 %if %{with ssl}
 %if %{with gnutls}
-Requires:	gnutls-devel
+Requires:	gnutls-devel >= 3.1.10
 %else
 Requires:	openssl-devel >= 0.9.7c
 %endif
 %endif
 Requires:	zlib-devel
+Requires:	zstd-devel
 Obsoletes:	libcurl2-devel
 
 %description devel
@@ -199,6 +204,19 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 Цей пакет містить статичну бібліотеку для розробки програм з
 використанням бібліотеки curl.
 
+%package -n fish-completion-%{name}
+Summary:	Fish completion for curl command
+Summary(pl.UTF-8):	Dopełnianie parametrów w fish dla polecenia curl
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	fish
+
+%description -n fish-completion-%{name}
+Fish completion for curl command.
+
+%description -n fish-completion-%{name} -l pl.UTF-8
+Dopełnianie parametrów w fish dla polecenia curl.
+
 %package -n zsh-completion-curl
 Summary:	ZSH completion for curl command
 Summary(pl.UTF-8):	Dopełnianianie parametrów w ZSH dla polecenia curl
@@ -242,6 +260,7 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 %else
 	--without-ssl --without-gnutls \
 %endif
+	--with-fish-functions-dir=%{fish_compdir} \
 	%{__with_without kerberos5 gssapi %{_prefix}} \
 	%{__with_without metalink libmetalink} \
 	%{__with_without rtmp librtmp} \
@@ -270,7 +289,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES COPYING README docs/{BUGS,FAQ,FEATURES,HISTORY.md,KNOWN_BUGS,MANUAL,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting}
+%doc CHANGES COPYING README docs/{BUGS.md,FAQ,FEATURES,HISTORY.md,KNOWN_BUGS,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting.md}
 %attr(755,root,root) %{_bindir}/curl
 %{_mandir}/man1/curl.1*
 
@@ -281,7 +300,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{CONTRIBUTE.md,INTERNALS.md,LICENSE-MIXING.md,RESOURCES}
+%doc docs/{CONTRIBUTE.md,INTERNALS.md}
 %attr(755,root,root) %{_bindir}/curl-config
 %attr(755,root,root) %{_libdir}/libcurl.so
 %{_libdir}/libcurl.la
@@ -299,6 +318,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libcurl.a
 
+%files -n fish-completion-%{name}
+%defattr(644,root,root,755)
+%{fish_compdir}/%{name}.fish
+
 %files -n zsh-completion-curl
 %defattr(644,root,root,755)
 %{_datadir}/zsh/site-functions/_curl