X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=curl.spec;h=ab7d9f58f30138d20d35477bbc3bf8ed908e5218;hb=38061d228fe354f21914902169ab08fdea1601a4;hp=34230c6c9b9588e90f12e52f0cc0f384ee002ef0;hpb=92e8c5080e0e7f4777a318278c0945e9281513cb;p=packages%2Fcurl.git

diff --git a/curl.spec b/curl.spec
index 34230c6..ab7d9f5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,6 +1,7 @@
 # TODO: ngtpc2/nghttp3 or quiche or msh3 for HTTP3?
 #
 # Conditional build:
+%bcond_without	static_libs	# static library
 %bcond_without	ssh		# SSH support
 %bcond_without	ssl		# SSL support
 %bcond_with	gnutls		# GnuTLS instead of OpenSSL
@@ -24,12 +25,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:	8.2.1
+Version:	8.7.1
 Release:	1
 License:	MIT-like
 Group:		Applications/Networking
 Source0:	https://curl.se/download/%{name}-%{version}.tar.xz
-# Source0-md5:	556576a795bdd2c7d10de6886480065f
+# Source0-md5:	f4f37253c5f1ad9ee85fa6215fdfeb42
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-krb5flags.patch
 URL:		https://curl.se/
@@ -42,7 +43,7 @@ BuildRequires:	libbrotli-devel >= 1.0.0
 BuildRequires:	libidn2-devel
 BuildRequires:	libpsl-devel
 %{?with_rtmp:BuildRequires:	librtmp-devel}
-%{?with_ssh:BuildRequires:	libssh2-devel >= 1.2.8}
+%{?with_ssh:BuildRequires:	libssh2-devel >= 1.11.0}
 BuildRequires:	libtool
 BuildRequires:	nettle-devel
 %{?with_http2:BuildRequires:	nghttp2-devel >= 1.15.0}
@@ -124,7 +125,7 @@ Summary(pl.UTF-8):	Biblioteka curl
 Group:		Libraries
 %{?with_ares:Requires:	c-ares >= 1.17.0}
 %{?with_gnutls:Requires:	gnutls-libs >= 3.1.10}
-%{?with_ssh:Requires:	libssh2 >= 1.2.8}
+%{?with_ssh:Requires:	libssh2%{?_isa} >= 1.11.0}
 %{?with_http2:Requires:	nghttp2-libs >= 1.15.0}
 %if %{with ssl} && %{without gnutls}
 Requires:	libbrotli >= 1.0.0
@@ -154,7 +155,7 @@ 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_ssh:Requires:	libssh2-devel%{?_isa} >= 1.11.0}
 %{?with_http2:Requires:	nghttp2-devel >= 1.15.0}
 %{?with_ldap:Requires:	openldap-devel}
 %if %{with ssl}
@@ -254,6 +255,7 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 %{__automake}
 %configure \
 	ac_cv_header_gss_h=no \
+	%{__enable_disable static_libs static} \
 	%{__enable_disable ares} \
 	%{__with_without gsasl libgsasl} \
 	--enable-headers-api \
@@ -273,6 +275,7 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 	--without-ssl \
 %endif
 	--with-fish-functions-dir=%{fish_compdir} \
+	--with-zsh-functions-dir=%{zsh_compdir} \
 	%{__with_without kerberos5 gssapi %{_prefix}} \
 	%{__with_without rtmp librtmp} \
 	%{__with_without http2 nghttp2} \
@@ -331,9 +334,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/CURLMOPT_*.3*
 %{_mandir}/man3/CURLSHOPT_*.3*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcurl.a
+%endif
 
 %files -n fish-completion-%{name}
 %defattr(644,root,root,755)
@@ -341,4 +346,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n zsh-completion-curl
 %defattr(644,root,root,755)
-%{_datadir}/zsh/site-functions/_curl
+%{zsh_compdir}/_curl