X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=curl.spec;h=160dcd43314597fcfb9f9eb8ef54d87294c15310;hb=a04e3aea21ccc1752b931c22047764ad60886bd8;hp=a47ad1053b70a45a886f9ad978cf0a31ae9f7b57;hpb=0d5dacbcab0ba24b00137421a4c11830614d6ccd;p=packages%2Fcurl.git

diff --git a/curl.spec b/curl.spec
index a47ad10..160dcd4 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,12 +1,13 @@
+# TODO: ngtpc2/nghttp3 when ready (packages released, support working in curl)
 #
 # Conditional build:
 %bcond_without	ssh		# SSH support
 %bcond_without	ssl		# SSL support
 %bcond_with	gnutls		# GnuTLS instead of OpenSSL
+%bcond_without	gsasl		# SCRAM support with gsasl
 %bcond_without	kerberos5	# Heimdal Kerberos 5 support
 %bcond_without	ldap		# LDAP support
 %bcond_without	http2		# HTTP/2.0 support (nghttp2 based)
-%bcond_without	metalink	# metalink support
 %if "%{pld_release}" != "ac"
 %bcond_without	ares		# c-ares (asynchronous DNS operations) library support
 %bcond_without	rtmp		# Real Time Media Protocol support
@@ -22,40 +23,44 @@ 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.54.0
+Version:	7.79.0
 Release:	1
 License:	MIT-like
 Group:		Applications/Networking
-Source0:	https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5:	3cf2de0ca4ac43e59067eb6b4f876982
+Source0:	https://curl.haxx.se/download/%{name}-%{version}.tar.xz
+# Source0-md5:	24408ce0068de0ae7871039451ad6f97
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-krb5flags.patch
 URL:		http://curl.haxx.se/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 %{?with_ares:BuildRequires:	c-ares-devel >= 1.7.0}
+%{?with_gsasl:BuildRequires:	gsasl-devel}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
+BuildRequires:	libbrotli-devel >= 1.0.0
 BuildRequires:	libidn2-devel
-%{?with_metalink:BuildRequires:	libmetalink-devel >= 0.1.0}
 BuildRequires:	libpsl-devel
 %{?with_rtmp:BuildRequires:	librtmp-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:	rpm-build >= 4.6
 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:	xz
 BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	libcurl2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -114,14 +119,15 @@ 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
 Conflicts:	ca-certificates < 20080809-4
-Conflicts:	mysql-libs < 5.6.30-76.3.3
 
 %description libs
 curl library.
@@ -138,21 +144,24 @@ Summary(uk.UTF-8):	Файли для розробки з використанн
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_ares:Requires:	c-ares-devel}
+%{?with_gsasl:Requires:	gsasl-devel}
 %{?with_kerberos5:Requires:	heimdal-devel}
+Requires:	libbrotli-devel >= 1.0.0
 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
@@ -198,12 +207,27 @@ 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
+BuildArch:	noarch
+
+%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
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	zsh
+BuildArch:	noarch
 
 %description -n zsh-completion-curl
 ZSH completion for curl command.
@@ -227,6 +251,7 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 %configure \
 	ac_cv_header_gss_h=no \
 	%{__enable_disable ares} \
+	%{__enable_disable gsasl} \
 	--enable-ipv6 \
 	%{__enable_disable ldap} \
 	%{__enable_disable ldap ldaps} \
@@ -234,13 +259,15 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 %if %{with ssl}
 	--with-ca-bundle=/etc/certs/ca-certificates.crt \
 %if %{with gnutls}
-	--with-gnutls --without-ssl \
+	--with-gnutls --without-openssl \
 %else
-	--with-ssl=%{_prefix} \
+	--with-openssl=%{_prefix} \
 %endif
+%else
+	--without-ssl \
 %endif
+	--with-fish-functions-dir=%{fish_compdir} \
 	%{__with_without kerberos5 gssapi %{_prefix}} \
-	%{__with_without metalink libmetalink} \
 	%{__with_without rtmp librtmp} \
 	%{__with_without http2 nghttp2} \
 	%{__with_without ssh libssh2}
@@ -249,12 +276,16 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C scripts install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcurl.la
+
 # no longer in upstream but a lot of apps tries to include it so we create fake one
 [ -e $RPM_BUILD_ROOT%{_includedir}/curl/types.h ] && exit 1
 echo '#warning curl/types.h IS OBSOLETE FROM 2004. STOP USING IT' > $RPM_BUILD_ROOT%{_includedir}/curl/types.h
@@ -267,7 +298,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.md,HISTORY.md,KNOWN_BUGS,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting.md}
 %attr(755,root,root) %{_bindir}/curl
 %{_mandir}/man1/curl.1*
 
@@ -278,10 +309,9 @@ 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
 %{_includedir}/curl
 %{_pkgconfigdir}/libcurl.pc
 %{_aclocaldir}/libcurl.m4
@@ -296,6 +326,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}/curl.fish
+
 %files -n zsh-completion-curl
 %defattr(644,root,root,755)
 %{_datadir}/zsh/site-functions/_curl