[packages/curl] fix bcond disabling

[jajcus]

commit 838a6edad63745be45ac24135b9a8c45b921ba6a
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Wed Jun 3 19:28:27 2015 +0200

    fix bcond disabling
    
    Use __with_without and __enable_disable macros to make sure features
    are enabled and disabled as requested.

 curl.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index 0475db3..df4e656 100644
--- a/curl.spec
+++ b/curl.spec
@@ -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 ssh2} \
 	--enable-ipv6 \
-	%{!?with_ldap:--disable-ldap}%{?with_ldap:--enable-ldaps}
+	%{__enable_disable ldap} \
+	%{__enable_disable ldap ldaps}
 
 %{__make}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/838a6edad63745be45ac24135b9a8c45b921ba6a