without ssh2 fix

[packages/curl.git] / curl.spec

diff --git a/curl.spec b/curl.spec
index 0b2b11a403146206023fe1d553a20480db8c277d..24074df10201c69451118a34df05600787dfa3de 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -22,12 +22,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.42.0
+Version:       7.42.1
 Release:       1
 License:       MIT-like
 Group:         Applications/Networking
 Source0:       http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: fddfab60987ee6119652b57c082d2623
+# Source0-md5: f1e460020a99da039b153e4bf0cd8600
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/
@@ -45,7 +45,7 @@ BuildRequires:        nettle-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.453
+BuildRequires: rpmbuild(macros) >= 1.527
 %if %{with ssl}
 %if %{with gnutls}
 BuildRequires: gnutls-devel
@@ -219,13 +219,15 @@ Bibliotecas estáticas para desenvolvimento com o curl.
        --with-ssl=%{_prefix} \
 %endif
 %endif
-       %{?with_kerberos5:--with-gssapi=%{_prefix}} \
-       %{?with_metalink:--with-libmetalink} \
-       %{?with_rtmp:--with-librtmp} \
-       %{?with_http2:--with-nghttp2} \
-       %{?with_ares:--enable-ares} \
+       %{__with_without kerberos5 gssapi %{_prefix}} \
+       %{__with_without metalink libmetalink} \
+       %{__with_without rtmp librtmp} \
+       %{__with_without http2 nghttp2} \
+       %{__enable_disable ares} \
+       %{__with_without ssh libssh2} \
        --enable-ipv6 \
-       %{!?with_ldap:--disable-ldap}%{?with_ldap:--enable-ldaps}
+       %{__enable_disable ldap} \
+       %{__enable_disable ldap ldaps}
 
 %{__make}